diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-03-29 12:25:46 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-29 12:25:46 +0100 |
| commit | 047a74d0e7e092f4a30eb5851eb561306994f0a9 (patch) | |
| tree | bddda28e343c281f6bdd9ed58b4a2762e2ddcb5e | |
| parent | 0f5161e17902849ac1dd81db0efcc42b764c3697 (diff) | |
use --hash-style=gnu linking when supported
| -rwxr-xr-x | configure.in | 9 | ||||
| -rwxr-xr-x | set_soenv.in | 1 | ||||
| -rw-r--r-- | solenv/inc/unxgcc.mk | 2 | ||||
| -rw-r--r-- | stlport/makefile.mk | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 3644db9522ca..1260cd2f4083 100755 --- a/configure.in +++ b/configure.in @@ -951,6 +951,10 @@ AC_ARG_WITH(system-mozilla, WITH_SYSTEM_MOZILLA=$withval , WITH_SYSTEM_MOZILLA=no) +AC_ARG_WITH(linker-hash-style, +[ --with-linker-hash-style +], WITH_LINKER_HASH_STYLE=$withval, WITH_LINKER_HASH_STYLE=gnu) + AC_ARG_WITH(stlport, AS_HELP_STRING([--with-stlport], [Build the STLPort library for compatibility with old extensions for @@ -2013,9 +2017,9 @@ if test "$_os" = "SunOS"; then fi if test "$GCC" = "yes"; then - AC_MSG_CHECKING( for --hash-style=both linker support ) + AC_MSG_CHECKING( for --hash-style=$WITH_LINKER_HASH_STYLE linker support ) hash_style_ldflags_save=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,--hash-style=both" + LDFLAGS="$LDFLAGS -Wl,--hash-style=$WITH_LINKER_HASH_STYLE" AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <stdio.h> ],[ @@ -2029,6 +2033,7 @@ if test "$GCC" = "yes"; then LDFLAGS=$hash_style_ldflags_save fi AC_SUBST(HAVE_LD_HASH_STYLE) +AC_SUBST(WITH_LINKER_HASH_STYLE) dnl =================================================================== dnl Check whether there's a Perl version available. diff --git a/set_soenv.in b/set_soenv.in index 951f24b27bd1..36763dd6c218 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1813,6 +1813,7 @@ ToFile( "HAVE_GCC_VISIBILITY_FEATURE", ToFile( "HAVE_GCC_VISIBILITY_BROKEN", "@HAVE_GCC_VISIBILITY_BROKEN@", "e" ); ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" ); +ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" ); ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS", "@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" ); ToFile( "HAVE_CXX0X", "@HAVE_CXX0X@", "e" ); diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk index 8dbacfae34d8..c73333f82fe8 100644 --- a/solenv/inc/unxgcc.mk +++ b/solenv/inc/unxgcc.mk @@ -231,7 +231,7 @@ STDSHLCUIMT+=-ljemalloc .ENDIF .IF "$(HAVE_LD_HASH_STYLE)" == "TRUE" -LINKFLAGS += -Wl,--hash-style=both +LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE) .ELSE LINKFLAGS += -Wl,-zdynsort .ENDIF diff --git a/stlport/makefile.mk b/stlport/makefile.mk index 04ab66af2910..3c74d229662f 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -130,7 +130,7 @@ BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER) BUILD_FLAGS+= -j$(MAXPROCESS) .ENDIF .IF "$(HAVE_LD_HASH_STYLE)" == "TRUE" -CXX+= -Wl,--hash-style=both +CXX+= -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE) .ENDIF .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE" |