From 52fa22bd84aaf8f97228472d526a856c7390c95c Mon Sep 17 00:00:00 2001
From: Jérôme Duval <jerome.duval@gmail.com>
Date: Wed, 22 Jul 2015 19:31:26 +0200
Subject: [PATCH] gcc: sync configure.ac with configure and regen.

---
 gcc/configure              |  2 +-
 gcc/configure.ac           | 12 ++++++++++++
 gcc/libstdc++-v3/configure | 24 +++++++++++++++++-------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/gcc/configure b/gcc/configure
index 690041a..cec7830 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -5212,7 +5212,7 @@
   # always differ), so we disassemble both files and compare the results:
   if uname -o | grep -iq haiku; then
     gcc_cv_prog_cmp_skip='objdump -Dz $$f1 | tail +6 >tmp-foo1; objdump -Dz $$f2 | tail +6 >tmp-foo2; cmp tmp-foo1 tmp-foo2'
-  else 
+  else
     gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
     echo abfoo >t1
     echo cdfoo >t2
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 90221a7..835346a 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -391,6 +391,9 @@
   i[[3456789]]86-*-msdosdjgpp*)
     noconfigdirs="$noconfigdirs tcl tk itcl"
     ;;
+  *-*-haiku*)
+    noconfigdirs="$noconfigdirs tk itcl libgui gdb"
+    ;;
 esac
 
 
@@ -671,6 +674,9 @@
   x86_64-*-darwin[[912]]*)
     ;;
   *-*-darwin*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  *-*-haiku*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
   *-*-netware*)
@@ -849,6 +855,9 @@
   *-*-freebsd*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
+  *-*-haiku*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
   *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
@@ -901,6 +910,9 @@
 	&& test -f /usr/local/include/gmp.h; then
       with_gmp=/usr/local
     fi
+    ;;
+  *-*-haiku*)
+    noconfigdirs="$noconfigdirs gdb target-libiberty"
     ;;
   *-*-kaos*)
     # Remove unsupported stuff on all kaOS configurations.
diff --git a/gcc/libstdc++-v3/configure b/gcc/libstdc++-v3/configure
index fff6d59..14ad38f 100755
--- a/gcc/libstdc++-v3/configure
+++ b/gcc/libstdc++-v3/configure
@@ -11518,7 +11518,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11522 "configure"
+#line 11521 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11624,7 +11624,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11628 "configure"
+#line 11627 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12576,8 +12576,8 @@
         ;;
 
       haiku*)
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        link_all_deplibs=yes
+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        link_all_deplibs_CXX=yes
         ;;
 
       hpux9*)
@@ -15036,7 +15036,7 @@
     #
     # Fake what AC_TRY_COMPILE does.  XXX Look at redoing this new-style.
     cat > conftest.$ac_ext << EOF
-#line 15041 "configure"
+#line 15039 "configure"
 struct S { ~S(); };
 void bar();
 void foo()
@@ -15386,7 +15386,7 @@
   # Fake what AC_TRY_COMPILE does.
 
     cat > conftest.$ac_ext << EOF
-#line 15391 "configure"
+#line 15389 "configure"
 int main()
 {
   typedef bool atomic_type;
@@ -15421,7 +15421,7 @@
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15426 "configure"
+#line 15424 "configure"
 int main()
 {
   typedef short atomic_type;
@@ -15456,7 +15456,7 @@
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15461 "configure"
+#line 15459 "configure"
 int main()
 {
   // NB: _Atomic_word not necessarily int.
@@ -15492,7 +15492,7 @@
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15497 "configure"
+#line 15495 "configure"
 int main()
 {
   typedef long long atomic_type;
@@ -15571,7 +15571,7 @@
   # unnecessary for this test.
 
     cat > conftest.$ac_ext << EOF
-#line 15576 "configure"
+#line 15574 "configure"
 int main()
 {
   _Decimal32 d1;
@@ -15613,7 +15613,7 @@
   # unnecessary for this test.
 
     cat > conftest.$ac_ext << EOF
-#line 15618 "configure"
+#line 15616 "configure"
 template<typename T1, typename T2>
   struct same
   { typedef T2 type; };
@@ -15647,7 +15647,7 @@
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15652 "configure"
+#line 15650 "configure"
 template<typename T1, typename T2>
   struct same
   { typedef T2 type; };
--
gitore 0.2.2