svn commit: trunk/uClibc/ldso/ldso

[vapier at uclibc.org]

Author: vapier
Date: 2005-11-20 09:58:23 -0800 (Sun, 20 Nov 2005)
New Revision: 12444

Log:
fix up ifdef checks so dl_iterate_phdr is defined in all the proper objects

Modified:
   trunk/uClibc/ldso/ldso/Makefile.in
   trunk/uClibc/ldso/ldso/dl-elf.c


Changeset:
Modified: trunk/uClibc/ldso/ldso/Makefile.in
===================================================================
--- trunk/uClibc/ldso/ldso/Makefile.in	2005-11-20 14:32:44 UTC (rev 12443)
+++ trunk/uClibc/ldso/ldso/Makefile.in	2005-11-20 17:58:23 UTC (rev 12444)
@@ -5,7 +5,7 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-CFLAGS-ldso := -DNOT_IN_libc -DIS_IN_rtld $(SSP_DISABLE_FLAGS)
+CFLAGS-ldso := -DNOT_IN_libc -DIS_IN_rtld $(SSP_DISABLE_FLAGS) -D_GNU_SOURCE
 
 # This stuff will not work with -fomit-frame-pointer
 CFLAGS-ldso += -fno-omit-frame-pointer

Modified: trunk/uClibc/ldso/ldso/dl-elf.c
===================================================================
--- trunk/uClibc/ldso/ldso/dl-elf.c	2005-11-20 14:32:44 UTC (rev 12443)
+++ trunk/uClibc/ldso/ldso/dl-elf.c	2005-11-20 17:58:23 UTC (rev 12444)
@@ -793,8 +793,10 @@
 {
 	__dl_parse_dynamic_info(dpnt, dynamic_info, debug_addr, load_off);
 }
+
+/* we want this in ldso.so and libdl.a but nowhere else */
 #ifdef __USE_GNU
-#if ! defined LIBDL || (! defined PIC && ! defined __PIC__)
+#if defined IS_IN_rtld || (defined IS_IN_libdl && ! defined SHARED)
 int
 __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, size_t size, void *data), void *data)
 {