diff options
Diffstat (limited to 'libssp')
| -rw-r--r-- | libssp/ChangeLog | 6 | ||||
| -rwxr-xr-x | libssp/configure | 53 | ||||
| -rw-r--r-- | libssp/configure.ac | 47 |
3 files changed, 65 insertions, 41 deletions
diff --git a/libssp/ChangeLog b/libssp/ChangeLog index 1e7b9acecd8..d8f42a94dab 100644 --- a/libssp/ChangeLog +++ b/libssp/ChangeLog @@ -1,3 +1,9 @@ +2011-03-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR bootstrap/48135 + * configure.ac (ssp_use_symver): Handle --disable-symvers. + * configure: Regenerate. + 2011-02-13 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * Makefile.in: Regenerate. diff --git a/libssp/configure b/libssp/configure index 85a6a0a941a..b1edcb4295b 100755 --- a/libssp/configure +++ b/libssp/configure @@ -734,6 +734,7 @@ enable_version_specific_runtime_libs enable_maintainer_mode enable_multilib enable_dependency_tracking +enable_symvers enable_shared enable_static with_pic @@ -1372,6 +1373,7 @@ Optional Features: --enable-multilib build many library versions (default) --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors + --disable-symvers disable symbol versioning for libssp --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -4098,19 +4100,27 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether symbol versioning is supported" >&5 $as_echo_n "checking whether symbol versioning is supported... " >&6; } -if test x$gcc_no_link = xyes; then - # If we cannot link, we cannot build shared libraries, so do not use - # symbol versioning. - ssp_use_symver=no +# Check whether --enable-symvers was given. +if test "${enable_symvers+set}" = set; then : + enableval=$enable_symvers; ssp_use_symver=$enableval else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -fPIC -shared -Wl,--version-script,./conftest.map" - cat > conftest.map <<EOF + ssp_use_symver=yes +fi + +if test "x$ssp_use_symver" = xyes; then + if test x$gcc_no_link = xyes; then + # If we cannot link, we cannot build shared libraries, so do not use + # symbol versioning. + ssp_use_symver=no + else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -fPIC -shared -Wl,--version-script,./conftest.map" + cat > conftest.map <<EOF FOO_1.0 { global: *foo*; bar; local: *; }; EOF - if test x$gcc_no_link = xyes; then + if test x$gcc_no_link = xyes; then as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4131,18 +4141,18 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test x$ssp_use_symver = xno; then - case "$target_os" in - solaris2*) - LDFLAGS="$save_LDFLAGS" - LDFLAGS="$LDFLAGS -fPIC -shared -Wl,-M,./conftest.map" - # Sun ld cannot handle wildcards and treats all entries as undefined. - cat > conftest.map <<EOF + if test x$ssp_use_symver = xno; then + case "$target_os" in + solaris2*) + LDFLAGS="$save_LDFLAGS" + LDFLAGS="$LDFLAGS -fPIC -shared -Wl,-M,./conftest.map" + # Sun ld cannot handle wildcards and treats all entries as undefined. + cat > conftest.map <<EOF FOO_1.0 { global: foo; local: *; }; EOF - if test x$gcc_no_link = xyes; then + if test x$gcc_no_link = xyes; then as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4163,10 +4173,11 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - ;; - esac + ;; + esac + fi + LDFLAGS="$save_LDFLAGS" fi - LDFLAGS="$save_LDFLAGS" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ssp_use_symver" >&5 $as_echo "$ssp_use_symver" >&6; } @@ -10639,7 +10650,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10642 "configure" +#line 10653 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10745,7 +10756,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10748 "configure" +#line 10759 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libssp/configure.ac b/libssp/configure.ac index ee48f4db16d..0eee36ce014 100644 --- a/libssp/configure.ac +++ b/libssp/configure.ac @@ -72,35 +72,42 @@ if test x$ssp_hidden = xyes; then fi AC_MSG_CHECKING([whether symbol versioning is supported]) -if test x$gcc_no_link = xyes; then - # If we cannot link, we cannot build shared libraries, so do not use - # symbol versioning. - ssp_use_symver=no -else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -fPIC -shared -Wl,--version-script,./conftest.map" - cat > conftest.map <<EOF +AC_ARG_ENABLE(symvers, +AS_HELP_STRING([--disable-symvers], + [disable symbol versioning for libssp]), +ssp_use_symver=$enableval, +ssp_use_symver=yes) +if test "x$ssp_use_symver" = xyes; then + if test x$gcc_no_link = xyes; then + # If we cannot link, we cannot build shared libraries, so do not use + # symbol versioning. + ssp_use_symver=no + else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -fPIC -shared -Wl,--version-script,./conftest.map" + cat > conftest.map <<EOF FOO_1.0 { global: *foo*; bar; local: *; }; EOF - AC_TRY_LINK([int foo;],[],[ssp_use_symver=gnu],[ssp_use_symver=no]) - if test x$ssp_use_symver = xno; then - case "$target_os" in - solaris2*) - LDFLAGS="$save_LDFLAGS" - LDFLAGS="$LDFLAGS -fPIC -shared -Wl,-M,./conftest.map" - # Sun ld cannot handle wildcards and treats all entries as undefined. - cat > conftest.map <<EOF + AC_TRY_LINK([int foo;],[],[ssp_use_symver=gnu],[ssp_use_symver=no]) + if test x$ssp_use_symver = xno; then + case "$target_os" in + solaris2*) + LDFLAGS="$save_LDFLAGS" + LDFLAGS="$LDFLAGS -fPIC -shared -Wl,-M,./conftest.map" + # Sun ld cannot handle wildcards and treats all entries as undefined. + cat > conftest.map <<EOF FOO_1.0 { global: foo; local: *; }; EOF - AC_TRY_LINK([int foo;],[],[ssp_use_symver=sun],[ssp_use_symver=no]) - ;; - esac + AC_TRY_LINK([int foo;],[],[ssp_use_symver=sun],[ssp_use_symver=no]) + ;; + esac + fi + LDFLAGS="$save_LDFLAGS" fi - LDFLAGS="$save_LDFLAGS" fi AC_MSG_RESULT($ssp_use_symver) AM_CONDITIONAL(LIBSSP_USE_SYMVER, [test "x$ssp_use_symver" != xno]) |