svn commit: [25822] branches/uClibc-nptl

[aldot at uclibc.org]

Author: aldot
Date: 2009-03-25 19:33:56 +0000 (Wed, 25 Mar 2009)
New Revision: 25822

Log:
Merged revisions 25821 via svnmerge from 
svn+ssh://aldot@svn.uclibc.org/svn/trunk/uClibc

........
  r25821 | aldot | 2009-03-25 20:27:56 +0100 (Wed, 25 Mar 2009) | 2 lines
  
  - do not pass -Wl with -shared in LDFLAGS_NOSTRIP (Peter S. Mazinger)
........


Modified:
   branches/uClibc-nptl/
   branches/uClibc-nptl/Rules.mak


Changeset:

Property changes on: branches/uClibc-nptl
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/uClibc:1-25760
   + /trunk/uClibc:1-25821

Modified: branches/uClibc-nptl/Rules.mak
===================================================================
--- branches/uClibc-nptl/Rules.mak	2009-03-25 19:27:56 UTC (rev 25821)
+++ branches/uClibc-nptl/Rules.mak	2009-03-25 19:33:56 UTC (rev 25822)
@@ -444,7 +444,7 @@
 	# -shared by itself would get us global function descriptors
 	# and calls through PLTs, dynamic resolution of symbols, etc,
 	# which would break as well, but -Bsymbolic comes to the rescue.
-	export LDPIEFLAG:=-Wl,-shared -Wl,-Bsymbolic
+	export LDPIEFLAG:=-shared -Wl,-Bsymbolic
 	UCLIBC_LDSO=ld.so.1
 endif
 
@@ -550,7 +550,7 @@
 CFLAGS += -DSTATIC
 endif
 
-LDFLAGS_NOSTRIP:=$(CPU_LDFLAGS-y) -Wl,-shared \
+LDFLAGS_NOSTRIP:=$(CPU_LDFLAGS-y) -shared \
 	-Wl,--warn-common -Wl,--warn-once -Wl,-z,combreloc
 # binutils-2.16.1 warns about ignored sections, 2.16.91.0.3 and newer are ok
 #LDFLAGS_NOSTRIP+=$(call check_ld,--gc-sections)