2012-05-21 Benjamin Kosnik <bkoz@redhat.com>

	PR libstdc++/52700
	* configure.ac: Allow gnu, gnu-versioned-namespace for
	--enable-symvers arguments.
	* configure: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@187730 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5b7e243bcc1f1a8ec5fe6a89c281e153709029bb..3a527bc5600a1605e4ffdd016b8612e38af0b27a 100644 (file)
--- 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-04-23  Andrew Haley  <aph@redhat.com>
 
        * defineclass.cc (MAJOR_1_7,  MINOR_1_7): New.

diff --git a/libjava/configure b/libjava/configure
index 8ea1aec5ee0ee3e77bf981b16b3ecc6c24686545..b0b45bb26af297afbd37bcd0facaa2383adee8a0 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -24557,7 +24557,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 ce428cac2576e9522a141f83d55ffb010e71145d..8a25a42daaf84850a1a89ea5f2e27c42a158823e 100644 (file)
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1825,7 +1825,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],

diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in
index 4497938127107b857afcbb49f9cd4bb03c54c7fa..3951e3589070e5bd85235dbf4a3125fedf64302a 100644 (file)
--- a/libjava/gcj/Makefile.in
+++ b/libjava/gcj/Makefile.in
@@ -135,7 +135,6 @@ EXCEPTIONSPEC = @EXCEPTIONSPEC@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GCC_FOR_ECJX = @GCC_FOR_ECJX@
-GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
 GCDEPS = @GCDEPS@
 GCINCS = @GCINCS@
 GCJ = @GCJ@
@@ -183,6 +182,7 @@ LIBART_LIBS = @LIBART_LIBS@
 LIBDIR = @LIBDIR@
 LIBFFI = @LIBFFI@
 LIBFFIINCS = @LIBFFIINCS@
+LIBGCC_UNWIND_INCLUDE = @LIBGCC_UNWIND_INCLUDE@
 LIBGCJDEBUG = @LIBGCJDEBUG@
 LIBGCJTESTSPEC = @LIBGCJTESTSPEC@
 LIBGCJ_BC_SPEC = @LIBGCJ_BC_SPEC@

diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in
index e6b043c378daaf5362d20197e70a103b835ad9bc..34f4ad031784d877ed38ed88b02030ace3cf0a5e 100644 (file)
--- a/libjava/include/Makefile.in
+++ b/libjava/include/Makefile.in
@@ -136,7 +136,6 @@ EXCEPTIONSPEC = @EXCEPTIONSPEC@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GCC_FOR_ECJX = @GCC_FOR_ECJX@
-GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
 GCDEPS = @GCDEPS@
 GCINCS = @GCINCS@
 GCJ = @GCJ@
@@ -184,6 +183,7 @@ LIBART_LIBS = @LIBART_LIBS@
 LIBDIR = @LIBDIR@
 LIBFFI = @LIBFFI@
 LIBFFIINCS = @LIBFFIINCS@
+LIBGCC_UNWIND_INCLUDE = @LIBGCC_UNWIND_INCLUDE@
 LIBGCJDEBUG = @LIBGCJDEBUG@
 LIBGCJTESTSPEC = @LIBGCJTESTSPEC@
 LIBGCJ_BC_SPEC = @LIBGCJ_BC_SPEC@

diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in
index a3ac9d81f4ab0048cd7ea2e8e3ccf9e3fc6a827d..28c4630cf442a173ddc52158618b2cd26efc6b89 100644 (file)
--- a/libjava/testsuite/Makefile.in
+++ b/libjava/testsuite/Makefile.in
@@ -111,7 +111,6 @@ EXCEPTIONSPEC = @EXCEPTIONSPEC@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GCC_FOR_ECJX = @GCC_FOR_ECJX@
-GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
 GCDEPS = @GCDEPS@
 GCINCS = @GCINCS@
 GCJ = @GCJ@
@@ -159,6 +158,7 @@ LIBART_LIBS = @LIBART_LIBS@
 LIBDIR = @LIBDIR@
 LIBFFI = @LIBFFI@
 LIBFFIINCS = @LIBFFIINCS@
+LIBGCC_UNWIND_INCLUDE = @LIBGCC_UNWIND_INCLUDE@
 LIBGCJDEBUG = @LIBGCJDEBUG@
 LIBGCJTESTSPEC = @LIBGCJTESTSPEC@
 LIBGCJ_BC_SPEC = @LIBGCJ_BC_SPEC@