diff options
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 5 | ||||
| -rw-r--r-- | libgomp/Makefile.in | 8 | ||||
| -rw-r--r-- | libgomp/acinclude.m4 | 2 | ||||
| -rw-r--r-- | libgomp/aclocal.m4 | 8 | ||||
| -rwxr-xr-x | libgomp/configure | 2 | ||||
| -rw-r--r-- | libgomp/testsuite/Makefile.in | 8 |
6 files changed, 19 insertions, 14 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 2e9be60c1ab..2aea502199c 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2011-01-20 Benjamin Kosnik <bkoz@redhat.com> + + PR libstdc++/36104 + * acinclude.m4 (LIBGOMP_ENABLE_SYMVERS): Accept gnu variants. + 2011-01-16 Gerald Pfeifer * configure.tgt (*-*-freebsd*): Add -lpthread to XLDFLAGS. diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index 9a7f713c910..b81936ac5ca 100644 --- a/libgomp/Makefile.in +++ b/libgomp/Makefile.in @@ -44,9 +44,7 @@ DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/omp_lib.f90.in $(srcdir)/libgomp_f.h.in \ $(srcdir)/libgomp.spec.in $(srcdir)/../depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../ltoptions.m4 \ - $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ - $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/../config/acx.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/futex.m4 \ @@ -55,7 +53,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../ltoptions.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../config/stdint.m4 \ - $(top_srcdir)/../config/tls.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../ltoptions.m4 \ + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/libgomp/acinclude.m4 b/libgomp/acinclude.m4 index d46d78596ec..eb876b9589e 100644 --- a/libgomp/acinclude.m4 +++ b/libgomp/acinclude.m4 @@ -223,7 +223,7 @@ AC_DEFUN([LIBGOMP_ENABLE_SYMVERS], [ LIBGOMP_ENABLE(symvers,yes,[=STYLE], [enables symbol versioning of the shared library], - [permit yes|no|gnu|sun]) + [permit yes|no|gnu*|sun]) # If we never went through the LIBGOMP_CHECK_LINKER_FEATURES macro, then we # don't know enough about $LD to do tricks... diff --git a/libgomp/aclocal.m4 b/libgomp/aclocal.m4 index 2232a7d4fd5..6aff9fd3a82 100644 --- a/libgomp/aclocal.m4 +++ b/libgomp/aclocal.m4 @@ -968,10 +968,6 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([../ltoptions.m4]) -m4_include([../ltsugar.m4]) -m4_include([../ltversion.m4]) -m4_include([../lt~obsolete.m4]) m4_include([../config/acx.m4]) m4_include([../config/depstand.m4]) m4_include([../config/enable.m4]) @@ -982,4 +978,8 @@ m4_include([../config/multi.m4]) m4_include([../config/override.m4]) m4_include([../config/stdint.m4]) m4_include([../config/tls.m4]) +m4_include([../ltoptions.m4]) +m4_include([../ltsugar.m4]) +m4_include([../ltversion.m4]) +m4_include([../lt~obsolete.m4]) m4_include([acinclude.m4]) diff --git a/libgomp/configure b/libgomp/configure index 883dddfbf78..961402f1e07 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -15783,7 +15783,7 @@ $as_echo "$ac_sectionLDflags" >&6; } if test "${enable_symvers+set}" = set; then : enableval=$enable_symvers; case "$enableval" in - yes|no|gnu|sun) ;; + yes|no|gnu*|sun) ;; *) as_fn_error "Unknown argument to enable/disable symvers" "$LINENO" 5 ;; esac diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in index 6ab9787f3bb..5273eaa2b35 100644 --- a/libgomp/testsuite/Makefile.in +++ b/libgomp/testsuite/Makefile.in @@ -37,9 +37,7 @@ target_triplet = @target@ subdir = testsuite DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../ltoptions.m4 \ - $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ - $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/../config/acx.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/futex.m4 \ @@ -48,7 +46,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../ltoptions.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../config/stdint.m4 \ - $(top_srcdir)/../config/tls.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../ltoptions.m4 \ + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) |