summaryrefslogtreecommitdiff
path: root/libgomp
diff options
context:
space:
mode:
authorbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2011-01-22 15:30:59 +0000
committerbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2011-01-22 15:30:59 +0000
commita562641c0dfbee57550a4b4d99f82acd3da99503 (patch)
tree03bbe2fa5c59a96c823f83b08089d54bbe0fe85b /libgomp
parent3edafd46128542d863667585f9a89284fdbd1af2 (diff)
downloadgcc-a562641c0dfbee57550a4b4d99f82acd3da99503.tar.gz
2011-01-22 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 169126 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@169127 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/ChangeLog5
-rw-r--r--libgomp/acinclude.m42
-rwxr-xr-xlibgomp/configure2
3 files changed, 7 insertions, 2 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/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/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