svn commit: branches/uClibc_0_9_29

[vapier at uclibc.org]

Author: vapier
Date: 2008-01-05 09:36:29 -0800 (Sat, 05 Jan 2008)
New Revision: 20764

Log:
Merge r19839 by vapier from trunk:
simplify binutils as-needed support and enable it all the time regardless of ssp


Modified:
   branches/uClibc_0_9_29/Rules.mak


Changeset:
Modified: branches/uClibc_0_9_29/Rules.mak
===================================================================
--- branches/uClibc_0_9_29/Rules.mak	2008-01-05 17:36:08 UTC (rev 20763)
+++ branches/uClibc_0_9_29/Rules.mak	2008-01-05 17:36:29 UTC (rev 20764)
@@ -335,12 +335,8 @@
 
 # Check for AS_NEEDED support in linker script (binutils>=2.16.1 has it)
 ifndef ASNEEDED
-ifneq ($(UCLIBC_HAS_SSP),y)
-export ASNEEDED:=
-else
-export ASNEEDED:=$(shell (LD_TMP=$(mktemp LD_XXXXXX) ; echo "GROUP ( AS_NEEDED ( /usr/lib/libc.so ) )" > $LD_TMP && if $(LD) -T $LD_TMP -o /dev/null > /dev/null 2>&1; then echo "AS_NEEDED ( $(UCLIBC_LDSO) )"; else echo "$(UCLIBC_LDSO)"; fi; rm -f $LD_TMP ) )
+export ASNEEDED:=$(shell $(LD) --help 2>/dev/null | grep -q -- --as-needed && echo "AS_NEEDED ( $(UCLIBC_LDSO) )" || echo "$(UCLIBC_LDSO)")
 endif
-endif
 
 # Add a bunch of extra pedantic annoyingly strict checks
 XWARNINGS=$(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes -fno-strict-aliasing