diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2012-02-27 13:51:50 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2012-02-27 13:51:50 +0000 |
| commit | cc2de92d5a4fbc66cbcfd1c9187c4ebecc4f46b3 (patch) | |
| tree | 1021fa2934b370402c6c9d89778a3c5d3dae290a /libgomp/configure | |
| parent | f59280cf80e22bf30bcbb173e9f100959e5ed768 (diff) | |
| download | gcc-cc2de92d5a4fbc66cbcfd1c9187c4ebecc4f46b3.zip gcc-cc2de92d5a4fbc66cbcfd1c9187c4ebecc4f46b3.tar.gz gcc-cc2de92d5a4fbc66cbcfd1c9187c4ebecc4f46b3.tar.bz2 | |
Fix Solaris symbol versioning (PR libstdc++/52188)
contrib:
PR libstdc++/52188
* make_sunver.pl: Remove #ifdef handling.
libgomp:
PR libstdc++/52188
* acinclude.m4 (LIBGOMP_ENABLE_SYMVERS): Remove symvers_renaming.
Remove ENABLE_SYMVERS_SOL2.
* configure: Regenerate.
* Makefile.am [LIBGOMP_BUILD_VERSIONED_SHLIB] (comma): New variable.
(PREPROCESS): New variable.
(libgomp.ver): New target.
[LIBGOMP_BUILD_VERSIONED_SHLIB &&
LIBGOMP_BUILD_VERSIONED_SHLIB_GNU]: Remove
LIBGOMP_BUILD_VERSIONED_SHLIB_SOL2 handling.
Use libgomp.ver.
[LIBGOMP_BUILD_VERSIONED_SHLIB_SUN]: Use libgomp.ver, libgomp.ver-sun.
* Makefile.in: Regenerate.
libstdc++-v3:
PR libstdc++/52188
* acinclude.m4 (GLIBCXX_ENABLE_SYMVERS): Remove symvers_renaming.
Remove ENABLE_SYMVERS_SOL2.
* configure: Regenerate.
* src/Makefile.am [ENABLE_SYMVERS] (libstdc++-symbols.ver):
Postprocess mapfile.
[ENABLE_SYMVERS_GNU]: Remove ENABLE_SYMVERS_SOL2 handling.
* src/Makefile.in: Regenerate.
* config/abi/pre/gnu.ver (GLIBCXX_3.4.5) [!__sun__ && !__svr4__]:
Don't export
_ZNSt19istreambuf_iteratorI[cw]St11char_traitsI[cw]EEppEv.
From-SVN: r184598
Diffstat (limited to 'libgomp/configure')
| -rwxr-xr-x | libgomp/configure | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/libgomp/configure b/libgomp/configure index 6f25c6f..8ed841a 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -619,8 +619,6 @@ link_gomp XLDFLAGS XCFLAGS config_path -LIBGOMP_BUILD_VERSIONED_SHLIB_SOL2_FALSE -LIBGOMP_BUILD_VERSIONED_SHLIB_SOL2_TRUE LIBGOMP_BUILD_VERSIONED_SHLIB_SUN_FALSE LIBGOMP_BUILD_VERSIONED_SHLIB_SUN_TRUE LIBGOMP_BUILD_VERSIONED_SHLIB_GNU_FALSE @@ -11082,7 +11080,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11085 "configure" +#line 11083 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11188,7 +11186,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11191 "configure" +#line 11189 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15994,27 +15992,17 @@ if test $enable_symvers != no ; then # The Solaris 2 runtime linker doesn't support the GNU extension of # binding the same symbol to different versions solaris2*) - symvers_renaming=no ;; + ;; # Other platforms with GNU symbol versioning (GNU/Linux, more?) do. *) $as_echo "#define HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT 1" >>confdefs.h - symvers_renaming=yes ;; + ;; esac -else - symvers_renaming=no -fi - if test $symvers_renaming = no; then - LIBGOMP_BUILD_VERSIONED_SHLIB_SOL2_TRUE= - LIBGOMP_BUILD_VERSIONED_SHLIB_SOL2_FALSE='#' -else - LIBGOMP_BUILD_VERSIONED_SHLIB_SOL2_TRUE='#' - LIBGOMP_BUILD_VERSIONED_SHLIB_SOL2_FALSE= fi - if test $enable_symvers = gnu; then $as_echo "#define LIBGOMP_GNU_SYMBOL_VERSIONING 1" >>confdefs.h @@ -16404,10 +16392,6 @@ if test -z "${LIBGOMP_BUILD_VERSIONED_SHLIB_SUN_TRUE}" && test -z "${LIBGOMP_BUI as_fn_error "conditional \"LIBGOMP_BUILD_VERSIONED_SHLIB_SUN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${LIBGOMP_BUILD_VERSIONED_SHLIB_SOL2_TRUE}" && test -z "${LIBGOMP_BUILD_VERSIONED_SHLIB_SOL2_FALSE}"; then - as_fn_error "conditional \"LIBGOMP_BUILD_VERSIONED_SHLIB_SOL2\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${USE_FORTRAN_TRUE}" && test -z "${USE_FORTRAN_FALSE}"; then as_fn_error "conditional \"USE_FORTRAN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 |