diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2011-03-28 17:09:27 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2011-03-28 17:09:27 +0000 |
| commit | e655afe144cf496408d83ebba53fd25eabcc2a68 (patch) | |
| tree | 2e23aa5f40d8ae58270dab9edc3234ebec0cc6c4 /libgomp | |
| parent | 88fbe056a9c787a6f4a5838660f1d3cfc489cc9e (diff) | |
| download | gcc-e655afe144cf496408d83ebba53fd25eabcc2a68.tar.gz | |
backport: re PR bootstrap/48135 (build fails on Solaris2.8 due to Glob.pm not found within /usr/perl5)
libgfortran:
backport from mainline:
2011-03-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR bootstrap/48135
* configure.ac (gfortran_use_symver): Handle --disable-symvers.
* configure: Regenerate.
libgomp:
backport from mainline:
2011-03-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR bootstrap/48135
* acinclude.m4 (enable_symvers): Handle --disable-symvers.
* configure: Regenerate.
libjava:
backport from mainline:
2011-03-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR bootstrap/48135
* configure.ac (libjava_cv_anon_version_script): Handle
--disable-symvers.
* configure: Regenerate.
libquadmath:
backport from mainline:
2011-03-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR bootstrap/48135
* configure.ac (quadmath_use_symver): Handle --disable-symvers.
* configure: Regenerate.
libssp:
backport from mainline:
2011-03-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR bootstrap/48135
* configure.ac (ssp_use_symver): Handle --disable-symvers.
* configure: Regenerate.
From-SVN: r171617
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 9 | ||||
| -rw-r--r-- | libgomp/acinclude.m4 | 30 | ||||
| -rwxr-xr-x | libgomp/configure | 30 |
3 files changed, 43 insertions, 26 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index a3e465dafba..3c64315572b 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,12 @@ +2011-03-28 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + Backport from mainline: + 2011-03-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR bootstrap/48135 + * acinclude.m4 (enable_symvers): Handle --disable-symvers. + * configure: Regenerate. + 2011-03-25 Release Manager * GCC 4.6.0 released. diff --git a/libgomp/acinclude.m4 b/libgomp/acinclude.m4 index eb876b9589e..4a4b62f01c3 100644 --- a/libgomp/acinclude.m4 +++ b/libgomp/acinclude.m4 @@ -228,20 +228,24 @@ LIBGOMP_ENABLE(symvers,yes,[=STYLE], # If we never went through the LIBGOMP_CHECK_LINKER_FEATURES macro, then we # don't know enough about $LD to do tricks... AC_REQUIRE([LIBGOMP_CHECK_LINKER_FEATURES]) -# FIXME The following test is too strict, in theory. -if test $enable_shared = no || test "x$LD" = x; then - enable_symvers=no -else - if test $with_gnu_ld = yes ; then - enable_symvers=gnu + +# Turn a 'yes' into a suitable default. +if test x$enable_symvers = xyes ; then + # FIXME The following test is too strict, in theory. + if test $enable_shared = no || test "x$LD" = x; then + enable_symvers=no else - case ${target_os} in - # Sun symbol versioning exists since Solaris 2.5. - solaris2.[[5-9]]* | solaris2.1[[0-9]]*) - enable_symvers=sun ;; - *) - enable_symvers=no ;; - esac + if test $with_gnu_ld = yes ; then + enable_symvers=gnu + else + case ${target_os} in + # Sun symbol versioning exists since Solaris 2.5. + solaris2.[[5-9]]* | solaris2.1[[0-9]]*) + enable_symvers=sun ;; + *) + enable_symvers=no ;; + esac + fi fi fi diff --git a/libgomp/configure b/libgomp/configure index 3368c0ec615..50dc29a6201 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -15780,20 +15780,24 @@ fi # If we never went through the LIBGOMP_CHECK_LINKER_FEATURES macro, then we # don't know enough about $LD to do tricks... -# FIXME The following test is too strict, in theory. -if test $enable_shared = no || test "x$LD" = x; then - enable_symvers=no -else - if test $with_gnu_ld = yes ; then - enable_symvers=gnu + +# Turn a 'yes' into a suitable default. +if test x$enable_symvers = xyes ; then + # FIXME The following test is too strict, in theory. + if test $enable_shared = no || test "x$LD" = x; then + enable_symvers=no else - case ${target_os} in - # Sun symbol versioning exists since Solaris 2.5. - solaris2.[5-9]* | solaris2.1[0-9]*) - enable_symvers=sun ;; - *) - enable_symvers=no ;; - esac + if test $with_gnu_ld = yes ; then + enable_symvers=gnu + else + case ${target_os} in + # Sun symbol versioning exists since Solaris 2.5. + solaris2.[5-9]* | solaris2.1[0-9]*) + enable_symvers=sun ;; + *) + enable_symvers=no ;; + esac + fi fi fi |