diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-23 08:31:30 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-23 08:31:30 +0000 |
| commit | 4d33a3e373c5c79b079c0b81ba6e38761a05b13d (patch) | |
| tree | 03d149b0d953752a98e5d96c404fbc0f363b98e6 /libjava | |
| parent | bd11046c067c9b3bbae45b2723d7bae0ccc99da2 (diff) | |
| download | gcc-4d33a3e373c5c79b079c0b81ba6e38761a05b13d.tar.gz | |
2012-05-23 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 187788 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@187795 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rwxr-xr-x | libjava/configure | 2 | ||||
| -rw-r--r-- | libjava/configure.ac | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 619c88e825e..e95c659e2e0 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2012-05-21 Benjamin Kosnik <bkoz@redhat.com> + + PR libstdc++/52700 + * configure.ac: Allow gnu, gnu-versioned-namespace for + --enable-symvers arguments. + * configure: Regenerate. + 2012-05-16 H.J. Lu <hongjiu.lu@intel.com> * configure: Regenerated. diff --git a/libjava/configure b/libjava/configure index 655179a89af..0bd423dadef 100755 --- a/libjava/configure +++ b/libjava/configure @@ -24542,7 +24542,7 @@ else # Check whether --enable-symvers was given. if test "${enable_symvers+set}" = set; then : enableval=$enable_symvers; case "$enableval" in - yes) libjava_cv_anon_version_script=yes ;; + yes|gnu*) libjava_cv_anon_version_script=yes ;; no) libjava_cv_anon_version_script=no ;; *) as_fn_error "Unknown argument to enable/disable symvers" "$LINENO" 5;; esac diff --git a/libjava/configure.ac b/libjava/configure.ac index 351b2bd9848..62c50003f3a 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1805,7 +1805,7 @@ AC_CACHE_CHECK([whether ld supports anonymous version scripts], AS_HELP_STRING([--disable-symvers], [disable symbol versioning for libjava]), [case "$enableval" in - yes) libjava_cv_anon_version_script=yes ;; + yes|gnu*) libjava_cv_anon_version_script=yes ;; no) libjava_cv_anon_version_script=no ;; *) AC_MSG_ERROR([Unknown argument to enable/disable symvers]);; esac], |