[git commit nptl] Blackfin: rename __dl_boot to __start

[Mike Frysinger]

commit: http://git.uclibc.org/uClibc/commit/?id=f229796e9164e91c0a54255420fcbf60626d3119
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl

The entry symbol is __start rather than __dl_boot.  While in the past this
was silently ignored, now with common code checking the _start symbol in C
code, we end up with link errors:

ldso/ldso/ld-uClibc_so.a(ldso.oS): In function `__dl_get_ready_to_run':
ldso/ldso/ldso.c:(.text+0x2b30): undefined reference to `__start'
collect2: ld returned 1 exit status
make[1]: *** [lib/ld-uClibc.so] Error 1

Signed-off-by: Mike Frysinger <vapier at gentoo.org>
Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
 ldso/ldso/bfin/dl-startup.h |   13 +++++--------
 ldso/ldso/bfin/dl-sysdep.h  |    6 +++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/ldso/ldso/bfin/dl-startup.h b/ldso/ldso/bfin/dl-startup.h
index ea62dad..f54c564 100644
--- a/ldso/ldso/bfin/dl-startup.h
+++ b/ldso/ldso/bfin/dl-startup.h
@@ -21,10 +21,7 @@ USA.  */
 /* Any assembly language/system dependent hacks needed to setup
  * boot1.c so it will work as expected and cope with whatever platform
  * specific wierdness is needed for this architecture.
-
- * We override the default _dl_boot function, and replace it with a
- * bit of asm.  Then call the real _dl_boot function, which is now
- * named _dl_boot2.  */
+ */
 
 /* At program start-up, p0 contains a pointer to a
    elf32_fdpic_loadmap that describes how the executable was loaded
@@ -41,9 +38,9 @@ USA.  */
 
 __asm__(
     "	.text\n"			\
-    "	.global	__dl_boot\n"		\
-    "	.type	__dl_boot, at function\n"	\
-    "__dl_boot:\n"			\
+    "	.global	__start\n"		\
+    "	.type	__start, at function\n"	\
+    "__start:\n"			\
     "	call	.Lcall\n"		\
     ".Lcall:\n"				\
     "	R4 = RETS;\n"			\
@@ -83,7 +80,7 @@ __asm__(
     "	P0 = R5;\n"			\
     "   SP += 32;\n"			\
     "   JUMP (P4);\n"			\
-    "	.size	__dl_boot,.-__dl_boot\n"
+    "	.size	__start,.-__start\n"
 );
 
 #undef DL_START
diff --git a/ldso/ldso/bfin/dl-sysdep.h b/ldso/ldso/bfin/dl-sysdep.h
index 89483ae..50c7509 100644
--- a/ldso/ldso/bfin/dl-sysdep.h
+++ b/ldso/ldso/bfin/dl-sysdep.h
@@ -137,10 +137,10 @@ struct funcdesc_ht;
 
 /*
  * Compute the GOT address.  On several platforms, we use assembly
- * here.  on FR-V FDPIC, there's no way to compute the GOT address,
+ * here.  on FDPIC, there's no way to compute the GOT address,
  * since the offset between text and data is not fixed, so we arrange
- * for the assembly _dl_boot to pass this value as an argument to
- * _dl_boot.  */
+ * for the ldso assembly entry point to pass this value as an argument
+ * to _dl_start.  */
 #define DL_BOOT_COMPUTE_GOT(got) ((got) = dl_boot_got_pointer)
 
 #define DL_BOOT_COMPUTE_DYN(dpnt, got, load_addr) \
-- 
1.6.3.3