summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-08-09 22:43:02 +0000
committerMike Frysinger <vapier@gentoo.org>2005-08-09 22:43:02 +0000
commit135c85905c900e4d8a1f6cf7abff87169a407aa8 (patch)
tree264f477c47ea82dd53e1f79443467c3c0aed7f65
parentae3bbeaa102cb1f66fefef808492bca1c447efe2 (diff)
disable early debug code if the arch relies on certain values (like load_addr) which are computer later
-rw-r--r--ldso/include/dl-string.h1
-rw-r--r--ldso/ldso/dl-startup.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/ldso/include/dl-string.h b/ldso/include/dl-string.h
index 8e35e6ad2..57f05bd79 100644
--- a/ldso/include/dl-string.h
+++ b/ldso/include/dl-string.h
@@ -274,6 +274,7 @@ static __always_inline char * _dl_simple_ltoahex(char * local, unsigned long i)
|| defined(__sh__) || defined(__powerpc__)
# define CONSTANT_STRING_GOT_FIXUP(X) \
if ((X) < (const char *) load_addr) (X) += load_addr
+# define NO_EARLY_SEND_STDERR
#else
# define CONSTANT_STRING_GOT_FIXUP(X)
#endif
diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c
index 3c6ce48f5..c2686c733 100644
--- a/ldso/ldso/dl-startup.c
+++ b/ldso/ldso/dl-startup.c
@@ -136,12 +136,14 @@ static void * __attribute_used__ _dl_start(unsigned long args)
aux_dat += argc; /* Skip over the argv pointers */
aux_dat++; /* Skip over NULL at end of argv */
envp = (char **) aux_dat;
+#ifndef NO_EARLY_SEND_STDERR
SEND_STDERR_DEBUG("argc=");
SEND_NUMBER_STDERR_DEBUG(argc, 0);
SEND_STDERR_DEBUG(" argv=");
SEND_ADDRESS_STDERR_DEBUG(argv, 0);
SEND_STDERR_DEBUG(" envp=");
SEND_ADDRESS_STDERR_DEBUG(envp, 1);
+#endif
while (*aux_dat)
aux_dat++; /* Skip over the envp pointers */
aux_dat++; /* Skip over NULL at end of envp */