[git commit ldso-future] ldso: include dl-startup.h in correct order
Peter S. Mazinger
ps.m at gmx.net
Thu Apr 14 07:59:26 UTC 2011
commit: http://git.uclibc.org/uClibc/commit/?id=437a81b948dd1cbf448436c1858094e8b5356467
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/ldso-future
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
ldso/include/dl-defs.h | 3 +++
ldso/ldso/bfin/dl-startup.h | 1 -
ldso/ldso/c6x/dl-startup.h | 1 -
ldso/ldso/dl-startup.c | 3 ---
ldso/ldso/frv/dl-startup.h | 1 -
5 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ldso/include/dl-defs.h b/ldso/include/dl-defs.h
index 4dc4461..7de76aa 100644
--- a/ldso/include/dl-defs.h
+++ b/ldso/include/dl-defs.h
@@ -76,6 +76,9 @@ typedef struct {
#ifdef _LIBC
/* arch specific defines */
+#ifdef IS_IN_rtld
+# include <dl-startup.h>
+#endif
#include <dl-sysdep.h>
#endif
diff --git a/ldso/ldso/bfin/dl-startup.h b/ldso/ldso/bfin/dl-startup.h
index 9f9e4d6..1da3166 100644
--- a/ldso/ldso/bfin/dl-startup.h
+++ b/ldso/ldso/bfin/dl-startup.h
@@ -84,7 +84,6 @@ __asm__(
" .size __start,.-__start\n"
);
-#undef DL_START
#define DL_START(X) \
static void __attribute_used__ \
_dl_start (Elf32_Addr dl_boot_got_pointer, \
diff --git a/ldso/ldso/c6x/dl-startup.h b/ldso/ldso/c6x/dl-startup.h
index da3e6f7..210cfe1 100644
--- a/ldso/ldso/c6x/dl-startup.h
+++ b/ldso/ldso/c6x/dl-startup.h
@@ -7,7 +7,6 @@
* Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
*/
-#undef DL_START
#define DL_START(X) \
int \
_dl_start (unsigned placeholder, \
diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c
index 78bed69..d1c2068 100644
--- a/ldso/ldso/dl-startup.c
+++ b/ldso/ldso/dl-startup.c
@@ -94,9 +94,6 @@
/* Needed for standalone execution */
static __attribute_used__ unsigned long _dl_skip_args = 0;
-/* Pull in all the arch specific stuff */
-#include <dl-startup.h>
-
/* Static declarations */
static int (*_dl_elf_main) (int, char **, char **);
diff --git a/ldso/ldso/frv/dl-startup.h b/ldso/ldso/frv/dl-startup.h
index 82e75aa..3781c6d 100644
--- a/ldso/ldso/frv/dl-startup.h
+++ b/ldso/ldso/frv/dl-startup.h
@@ -63,7 +63,6 @@ __asm__("" \
);
#define _dl_boot _dl_boot2
-#undef DL_START
#define DL_START(X) \
static void __attribute_used__ \
_dl_boot (void *dl_boot_got_pointer, \
--
1.7.3.4
More information about the uClibc-cvs
mailing list