Don't switch on -shared if the user specifies -r.

* Follow up to btrev43090, to include platforms missed in original commit.
Don't switch on -shared if the user specifies -r
2026-02-05 00:13:15 +01:00 · 2014-10-13 04:15:32 +00:00 · 2014-10-04 14:41:05 +13:00 · 2014-08-25 22:58:39 +02:00 · 2014-08-21 16:41:43 +02:00 · 2014-08-10 17:16:21 +02:00
25 changed files with 156 additions and 641 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,3 @@
+autom4te.cache
+jam/bin.*
+jam/jam0
--- a/gcc/gcc/config.gcc
+++ b/gcc/gcc/config.gcc
@@ -625,6 +625,19 @@ case ${target} in
  # need_64bit_hwint=yes # system compiler has this for all arch!
  use_gcc_stdint=wrap
  ;;
+*-*-haiku*)
+  # This is the generic ELF configuration of Haiku.  Later
+  # machine-specific sections may refine and add to this
+  # configuration.
+  #
+  gas=yes
+  gnu_ld=yes
+  tmake_file="t-slibgcc"
+  case ${enable_threads} in
+    "" | yes | posix) thread_file='posix' ;;
+  esac
+  default_use_cxa_atexit=yes
+  ;;
 *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
  extra_options="$extra_options gnu-user.opt"
  gas=yes
@@ -1239,11 +1252,11 @@ x86_64-*-freebsd*)
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
 	;;
 i[34567]86-*-haiku*)
-	tmake_file='t-haiku i386/t-crtpic'
+	tmake_file="${tmake_file} t-haiku i386/t-crtpic"
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h haiku.h i386/haiku.h haiku-stdint.h"
 	;;
 x86_64-*-haiku*)
-	tmake_file='t-haiku i386/t-haiku64'
+	tmake_file="${tmake_file} t-haiku i386/t-haiku64"
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h haiku.h i386/haiku64.h haiku-stdint.h"
 	;;
 i[34567]86-*-netbsdelf*)
@@ -1749,7 +1762,7 @@ m68k-*-rtems*)
 m68k-*-haiku*)
 	default_m68k_cpu=68020
 	default_cf_cpu=5206
-	tmake_file="m68k/t-m68kbare m68k/t-crtstuff t-haiku" #??
+	tmake_file="${tmake_file} m68k/t-m68kbare m68k/t-crtstuff t-haiku" #??
 	tm_file="${tm_file} dbxelf.h elfos.h haiku.h m68k/haiku.h"
 	tm_defines="${tm_defines} MOTOROLA=1"
 	;;
@@ -1954,10 +1967,6 @@ mips-*-elf* | mipsel-*-elf*)
 	tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h"
 	tmake_file="mips/t-elf"
 	;;
-mipsel-*-haiku*)
-	tmake_file='mips/t-elf t-haiku'
-	tm_file="elfos.h ${tm_file} haiku.h mips/haiku.h"
-	;;
 mips64-*-elf* | mips64el-*-elf*)
 	tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h"
 	tmake_file="mips/t-elf"
@@ -2100,7 +2109,7 @@ powerpc-*-eabi*)
 	use_gcc_stdint=wrap
 	;;
 powerpc-*-haiku*)
-	tmake_file="rs6000/t-fprules rs6000/t-ppcos rs6000/t-ppccomm t-haiku"
+	tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-ppcos rs6000/t-ppccomm t-haiku"
 	tm_file="${tm_file} dbxelf.h elfos.h freebsd-spec.h rs6000/sysv4.h haiku.h rs6000/haiku.h"
 	extra_options="${extra_options} rs6000/sysv4.opt"
 	;;
--- a/gcc/gcc/config/arm/haiku.h
+++ b/gcc/gcc/config/arm/haiku.h
@@ -75,6 +75,6 @@
 /* If ELF is the default format, we should not use /lib/elf.  */

 #undef	LINK_SPEC
-#define LINK_SPEC "%{!o*:-o %b} -m armelf -shared -no-undefined %{nostart:-e 0} \
+#define LINK_SPEC "%{!o*:-o %b} -m armelf %{!r:-shared} %{nostart:-e 0} %{shared:-e 0} %{!shared: %{!nostart: -no-undefined}}\
  %{mbig-endian:-EB} %{mlittle-endian:-EL} -X"

--- a/gcc/gcc/config/haiku.h
+++ b/gcc/gcc/config/haiku.h
@@ -55,18 +55,16 @@ Boston, MA 02111-1307, USA.  */
 #undef LIB_SPEC
 #define LIB_SPEC "-lroot"

-/* gcc runtime lib is built into libroot.so on Haiku */
-/* ??? This is gonna be lovely when the next release of gcc has
-   some new symbol in, so that links start failing.  */
-#undef LIBGCC_SPEC
-#define LIBGCC_SPEC ""
-
+/* Use --as-needed -lgcc_s for eh support.  */
+#ifdef HAVE_LD_AS_NEEDED
+#define USE_LD_AS_NEEDED 1
+#endif

 #undef  STARTFILE_SPEC
-#define STARTFILE_SPEC "crti.o%s crtbegin.o%s %{!shared:%{!nostart:start_dyn.o%s}} init_term_dyn.o%s"
+#define STARTFILE_SPEC "crti.o%s crtbeginS.o%s %{!shared:%{!nostart:start_dyn.o%s}} init_term_dyn.o%s"

 #undef  ENDFILE_SPEC
-#define ENDFILE_SPEC "crtend.o%s crtn.o%s"
+#define ENDFILE_SPEC "crtendS.o%s crtn.o%s"

 /* Every program on Haiku links against libroot which contains the pthread
   routines, so there's no need to explicitly call out when doing threaded
@@ -181,9 +179,9 @@ Boston, MA 02111-1307, USA.  */
   cause nasty problems if we override it.  */
 #define LIBRARY_PATH_ENV        "BELIBRARIES"

-/* With STANDARD_STARTFILE_PREFIX_{1,2} set to "/boot/common/develop/lib/"
-   and "/boot/system/develop/lib/", MD_STARTFILE_PREFIX adds the last one of the
-   standard paths. The user specific paths are set via LIBRARY_PATH_ENV. */
+/* Set STANDARD_STARTFILE_PREFIX_1 set to "/boot/system/develop/lib/", or the
+   respective secondary architecture path. The user specific paths are set via
+   LIBRARY_PATH_ENV. */
 #undef STANDARD_STARTFILE_PREFIX_1
 #undef STANDARD_STARTFILE_PREFIX_2
 #undef MD_STARTFILE_PREFIX
@@ -191,15 +189,12 @@ Boston, MA 02111-1307, USA.  */
 #ifdef HYBRID_SECONDARY
 /* For a secondary compiler on a hybrid system, use alternative search paths.*/
 #define STANDARD_STARTFILE_PREFIX_1 \
-  "/boot/common/develop/lib/" HYBRID_SECONDARY "/"
+  "/boot/system/non-packaged/develop/lib/" HYBRID_SECONDARY "/"
 #define STANDARD_STARTFILE_PREFIX_2 \
  "/boot/system/develop/lib/" HYBRID_SECONDARY "/"
-#define MD_STARTFILE_PREFIX \
-  "/boot/common/non-packaged/develop/lib/" HYBRID_SECONDARY "/"
 #else /* HYBRID_SECONDARY */
-#define STANDARD_STARTFILE_PREFIX_1   "/boot/common/develop/lib/"
+#define STANDARD_STARTFILE_PREFIX_1   "/boot/system/non-packaged/develop/lib/"
 #define STANDARD_STARTFILE_PREFIX_2   "/boot/system/develop/lib/"
-#define MD_STARTFILE_PREFIX           "/boot/common/non-packaged/develop/lib/"
 #endif /* HYBRID_SECONDARY */

 /* Haiku doesn't have a separate math library.  */
--- a/gcc/gcc/config/i386/haiku.h
+++ b/gcc/gcc/config/i386/haiku.h
@@ -53,7 +53,7 @@ Boston, MA 02111-1307, USA.  */
 /* If ELF is the default format, we should not use /lib/elf.  */

 #undef	LINK_SPEC
-#define LINK_SPEC "-m elf_i386_haiku -shared %{nostart:-e 0} %{shared:-e 0} %{!shared: %{!nostart: -no-undefined}}"
+#define LINK_SPEC "-m elf_i386_haiku %{!r:-shared} %{nostart:-e 0} %{shared:-e 0} %{!shared: %{!nostart: -no-undefined}}"

 /* A C statement (sans semicolon) to output to the stdio stream
   FILE the assembler definition of uninitialized global DECL named
--- a/gcc/gcc/config/i386/haiku64.h
+++ b/gcc/gcc/config/i386/haiku64.h
@@ -65,7 +65,7 @@ Boston, MA 02111-1307, USA.  */

 #undef	LINK_SPEC
 #define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386_haiku} \
-	-shared %{nostart:-e 0} %{shared:-e 0} %{!shared: %{!nostart: -no-undefined}}"
+	%{!r:-shared} %{nostart:-e 0} %{shared:-e 0} %{!shared: %{!nostart: -no-undefined}}"

 /* A C statement (sans semicolon) to output to the stdio stream
   FILE the assembler definition of uninitialized global DECL named
--- a/gcc/gcc/config/m68k/haiku.h
+++ b/gcc/gcc/config/m68k/haiku.h
@@ -108,7 +108,7 @@ Boston, MA 02110-1301, USA.  */

 #undef	LINK_SPEC
 /*#define LINK_SPEC "%{!o*:-o %b} -m elf_m68k_haiku -shared -no-undefined %{nostart:-e 0}"*/
-#define LINK_SPEC "%{!o*:-o %b} -m m68kelf -shared -no-undefined %{nostart:-e 0}"
+#define LINK_SPEC "%{!o*:-o %b} -m m68kelf %{!r:-shared} -no-undefined %{nostart:-e 0}"

 /* XXX: not sure for the rest there... */

--- a/gcc/gcc/config/mips/haiku.h
+++ b/gcc/gcc/config/mips/haiku.h
@@ -40,5 +40,5 @@ Boston, MA 02111-1307, USA.  */
  while (0)

 #undef	LINK_SPEC
-#define LINK_SPEC "%{!o*:-o %b} -m elf_mipsel_haiku -shared %{nostart:-e 0}"
+#define LINK_SPEC "%{!o*:-o %b} -m elf_mipsel_haiku %{!r:-shared} %{nostart:-e 0}"

--- a/gcc/gcc/config/rs6000/haiku.h
+++ b/gcc/gcc/config/rs6000/haiku.h
@@ -53,4 +53,4 @@ Boston, MA 02111-1307, USA.  */
 /* If ELF is the default format, we should not use /lib/elf.  */

 #undef	LINK_SPEC
-#define LINK_SPEC "%{!o*:-o %b} -m elf_ppc_haiku -shared -no-undefined %{nostart:-e 0}"
+#define LINK_SPEC "%{!o*:-o %b} -m elf_ppc_haiku %{!r:-shared} -no-undefined %{nostart:-e 0}"
--- a/gcc/libgcc/config.host
+++ b/gcc/libgcc/config.host
@@ -96,7 +96,7 @@ arm*-*-*)
 	;;
 avr-*-*)
 	cpu_type=avr
-	;;    
+	;;
 bfin*-*)
 	cpu_type=bfin
 	;;
@@ -195,6 +195,14 @@ case ${host} in
      ;;
  esac
  ;;
+*-*-haiku*)
+  # This is the generic ELF configuration of Haiku.  Later
+  # machine-specific sections may refine and add to this
+  # configuration.
+  tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-haiku t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver"
+  tmake_file="$tmake_file t-slibgcc-nolc-override"
+  extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+  ;;
 *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
  tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver t-linux"
  extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
@@ -324,10 +332,9 @@ arm*-*-netbsdelf*)
 	;;
 arm-*-haiku*)
 	tmake_file="${tmake_file} arm/t-arm arm/t-elf arm/t-bpabi"
-	tmake_file="$tmake_file t-softfp-sfdf t-softfp-excl arm/t-softfp t-softfp"
+	tmake_file="${tmake_file} t-softfp-sfdf t-softfp-excl arm/t-softfp t-softfp"
 	tm_file="${tm_file} arm/bpabi-lib.h"
 	unwind_header=config/arm/unwind-arm.h
-	extra_parts="crtbegin.o crtend.o"
 	;;
 arm*-*-linux*)			# ARM GNU/Linux with ELF
 	tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix"
@@ -515,12 +522,10 @@ x86_64-*-freebsd*)
 	tmake_file="${tmake_file} i386/t-freebsd i386/t-crtstuff"
 	;;
 i[34567]86-*-haiku*)
-	tmake_file="${tmake_file} i386/t-crtstuff t-libgcc-pic"
-	extra_parts="crtbegin.o crtend.o"
+	tmake_file="${tmake_file} i386/t-crtstuff i386/t-eh-dw2"
 	;;
 x86_64-*-haiku*)
-	tmake_file="${tmake_file} i386/t-crtstuff t-libgcc-pic"
-	extra_parts="crtbegin.o crtend.o"
+	tmake_file="${tmake_file} i386/t-crtstuff i386/t-eh-dw2"
 	;;
 i[34567]86-*-netbsdelf*)
 	;;
@@ -679,7 +684,7 @@ lm32-*-rtems*)
 lm32-*-uclinux*)
        extra_parts="$extra_parts crtbegin.o crtendS.o crtbeginT.o"
        tmake_file="lm32/t-lm32 lm32/t-uclinux t-libgcc-pic t-softfp-sfdf t-softfp"
-	;;	
+	;;
 m32r-*-elf*)
 	tmake_file=t-fdpbit
 	;;
@@ -697,7 +702,6 @@ m32rle-*-linux*)
 	tmake_file="$tmake_file m32r/t-linux t-fdpbit"
 	;;
 m68k-*-haiku*)
-	extra_parts="crtbegin.o crtend.o"
 	;;
 m68k-*-elf* | fido-*-elf)
 	tmake_file="$tmake_file m68k/t-floatlib"
@@ -750,9 +754,6 @@ mips*-*-linux*)				# Linux MIPS, either endian.
 		tmake_file="${tmake_file} mips/t-tpbit"
 	fi
 	;;
-mips*-*-haiku*)
-	extra_parts="crtbegin.o crtend.o"
-	;;
 mips*-sde-elf*)
 	tmake_file="$tmake_file mips/t-crtstuff mips/t-mips16"
 	case "${with_newlib}" in
@@ -856,7 +857,6 @@ powerpc*-*-freebsd*)
 	esac
 	;;
 powerpc-*-haiku*)
-	extra_parts="crtbegin.o crtend.o"
 	;;
 powerpc-*-netbsd*)
 	tmake_file="$tmake_file rs6000/t-netbsd rs6000/t-crtstuff"
--- a/gcc/libgcc/config/t-haiku
+++ b/gcc/libgcc/config/t-haiku
@@ -0,0 +1,3 @@
+# Use unwind-dw2-fde
+LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c \
+  $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- a/gcc/libgcc/configure
+++ b/gcc/libgcc/configure
--- a/gcc/libstdc++-v3/config/os/haiku/os_defines.h
+++ b/gcc/libstdc++-v3/config/os/haiku/os_defines.h
@@ -34,7 +34,7 @@
 // file will come before all others.

 // On Haiku, nanosleep and sched_yield are always available except for the
-// kernel and the bootloader, so use them. 
+// kernel and the bootloader, so use them.
 #if !defined(_KERNEL_MODE) && !defined(_LOADER_MODE)
 	#define _GLIBCXX_USE_NANOSLEEP 1
 	#define _GLIBCXX_USE_SCHED_YIELD 1
--- a/gcc/libstdc++-v3/configure
+++ b/gcc/libstdc++-v3/configure
@@ -6227,7 +6227,7 @@ aix[4-9]*)
  lt_cv_deplibs_check_method=pass_all
  ;;

-beos* | haiku*)
+beos*)
  lt_cv_deplibs_check_method=pass_all
  ;;

@@ -8563,7 +8563,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
      esac
      ;;

-    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
      # PIC is the default for these OSes.
      ;;

@@ -8583,8 +8583,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

    haiku*)
      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
      ;;

    hpux*)
@@ -9253,8 +9251,8 @@ _LT_EOF
      ;;

    haiku*)
-      allow_undefined_flag=unsupported
-      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
      ;;

    interix[3-9]*)
@@ -10547,7 +10545,7 @@ amigaos*)
  esac
  ;;

-beos* | haiku*)
+beos*)
  library_names_spec='${libname}${shared_ext}'
  dynamic_linker="$host_os ld.so"
  shlibpath_var=LIBRARY_PATH
@@ -10705,8 +10703,9 @@ haiku*)
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LIBRARY_PATH
  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
+  sys_lib_search_path_spec='/boot/system/non-packaged/develop/lib /boot/system/develop/lib'
+  sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/system/non-packaged/lib /boot/system/lib'
+  hardcode_into_libs=no
  ;;

 hpux9* | hpux10* | hpux11*)
@@ -11226,7 +11225,7 @@ else
  lt_cv_dlopen_libs=

  case $host_os in
-  beos* | haiku*)
+  beos* | haiku* )
    lt_cv_dlopen="load_add_on"
    lt_cv_dlopen_libs=
    lt_cv_dlopen_self=yes
@@ -12577,8 +12576,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        ;;

      haiku*)
-        allow_undefined_flag=unsupported
-        archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        link_all_deplibs=yes
        ;;

      hpux9*)
@@ -13445,8 +13444,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
        ;;
      esac
      ;;
-
-    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
      # PIC is the default for these OSes.
      ;;
    mingw* | cygwin* | os2* | pw32* | cegcc*)
@@ -13467,8 +13465,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
      ;;
    haiku*)
      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static_CXX=
      ;;
    interix[3-9]*)
      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
@@ -14233,7 +14229,7 @@ amigaos*)
  esac
  ;;

-beos* | haiku*)
+beos*)
  library_names_spec='${libname}${shared_ext}'
  dynamic_linker="$host_os ld.so"
  shlibpath_var=LIBRARY_PATH
@@ -14389,8 +14385,9 @@ haiku*)
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LIBRARY_PATH
  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
+  sys_lib_search_path_spec='/boot/system/non-packaged/develop/lib /boot/system/develop/lib'
+  sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/system/non-packaged/lib /boot/system/lib'
+  hardcode_into_libs=no
  ;;

 hpux9* | hpux10* | hpux11*)
@@ -15039,7 +15036,7 @@ fi
    #
    # Fake what AC_TRY_COMPILE does.  XXX Look at redoing this new-style.
    cat > conftest.$ac_ext << EOF
-#line 15042 "configure"
+#line 15041 "configure"
 struct S { ~S(); };
 void bar();
 void foo()
@@ -15389,7 +15386,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; }
  # Fake what AC_TRY_COMPILE does.

    cat > conftest.$ac_ext << EOF
-#line 15392 "configure"
+#line 15391 "configure"
 int main()
 {
  typedef bool atomic_type;
@@ -15424,7 +15421,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; }
    rm -f conftest*

    cat > conftest.$ac_ext << EOF
-#line 15427 "configure"
+#line 15426 "configure"
 int main()
 {
  typedef short atomic_type;
@@ -15459,7 +15456,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; }
    rm -f conftest*

    cat > conftest.$ac_ext << EOF
-#line 15462 "configure"
+#line 15461 "configure"
 int main()
 {
  // NB: _Atomic_word not necessarily int.
@@ -15495,7 +15492,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; }
    rm -f conftest*

    cat > conftest.$ac_ext << EOF
-#line 15498 "configure"
+#line 15497 "configure"
 int main()
 {
  typedef long long atomic_type;
@@ -15574,7 +15571,7 @@ $as_echo "$as_me: WARNING: Performance of certain classes will degrade as a resu
  # unnecessary for this test.

    cat > conftest.$ac_ext << EOF
-#line 15577 "configure"
+#line 15576 "configure"
 int main()
 {
  _Decimal32 d1;
@@ -15616,7 +15613,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  # unnecessary for this test.

    cat > conftest.$ac_ext << EOF
-#line 15619 "configure"
+#line 15618 "configure"
 template<typename T1, typename T2>
  struct same
  { typedef T2 type; };
@@ -15650,7 +15647,7 @@ $as_echo "$enable_int128" >&6; }
    rm -f conftest*

    cat > conftest.$ac_ext << EOF
-#line 15653 "configure"
+#line 15652 "configure"
 template<typename T1, typename T2>
  struct same
  { typedef T2 type; };
@@ -45705,157 +45702,18 @@ $as_echo "$ac_ld_relro" >&6; }

    fi
    ;;
-  *haiku*)

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in nan.h ieeefp.h endian.h sys/isa_defs.h \
+  *-haiku*)
+    for ac_header in nan.h ieeefp.h endian.h sys/isa_defs.h \
      machine/endian.h machine/param.h sys/machine.h sys/types.h \
      fp.h float.h endian.h inttypes.h locale.h float.h stdint.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF

 fi
@@ -45865,418 +45723,69 @@ done
    SECTION_FLAGS='-ffunction-sections -fdata-sections'


-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_INT64_T 1
-_ACEOF
+    $as_echo "#define HAVE_INT64_T 1" >>confdefs.h


-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ACOSF 1
-_ACEOF
+    $as_echo "#define HAVE_ACOSF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ASINF 1
-_ACEOF
+    $as_echo "#define HAVE_ASINF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ATANF 1
-_ACEOF
+    $as_echo "#define HAVE_ATANF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ATAN2F 1
-_ACEOF
+    $as_echo "#define HAVE_ATAN2F 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_CEILF 1
-_ACEOF
+    $as_echo "#define HAVE_CEILF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_COPYSIGN 1
-_ACEOF
+    $as_echo "#define HAVE_COSF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_COPYSIGNF 1
-_ACEOF
+    $as_echo "#define HAVE_COSHF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_COSF 1
-_ACEOF
+    $as_echo "#define HAVE_EXPF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_COSHF 1
-_ACEOF
+    $as_echo "#define HAVE_FABSF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_EXPF 1
-_ACEOF
+    $as_echo "#define HAVE_FINITE 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FABSF 1
-_ACEOF
+    $as_echo "#define HAVE_FINITEF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FINITE 1
-_ACEOF
+    $as_echo "#define HAVE_FLOORF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FINITEF 1
-_ACEOF
+    $as_echo "#define HAVE_FMODF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FLOORF 1
-_ACEOF
+    $as_echo "#define HAVE_FREXPF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FMODF 1
-_ACEOF
+    $as_echo "#define HAVE_HYPOT 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FREXPF 1
-_ACEOF
+    $as_echo "#define HAVE_HYPOTF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_HYPOT 1
-_ACEOF
+    $as_echo "#define HAVE_ISINF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_HYPOTF 1
-_ACEOF
+    $as_echo "#define HAVE_ISINFF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ISINF 1
-_ACEOF
+    $as_echo "#define HAVE_ISNAN 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ISINFF 1
-_ACEOF
+    $as_echo "#define HAVE_ISNANF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ISNAN 1
-_ACEOF
+    $as_echo "#define HAVE_LOGF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ISNANF 1
-_ACEOF
+    $as_echo "#define HAVE_LOG10F 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_LOGF 1
-_ACEOF
+    $as_echo "#define HAVE_MODFF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_LOG10F 1
-_ACEOF
+    $as_echo "#define HAVE_SINF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_MODFF 1
-_ACEOF
+    $as_echo "#define HAVE_SINHF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_SINF 1
-_ACEOF
+    $as_echo "#define HAVE_SQRTF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_SINHF 1
-_ACEOF
+    $as_echo "#define HAVE_TANF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_SQRTF 1
-_ACEOF
+    $as_echo "#define HAVE_TANHF 1" >>confdefs.h

-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TANF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TANHF 1
-_ACEOF
+    $as_echo "#define HAVE_TLS 1" >>confdefs.h

    ;;
-  *haiku*)

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in nan.h ieeefp.h endian.h sys/isa_defs.h \
-      machine/endian.h machine/param.h sys/machine.h sys/types.h \
-      fp.h float.h endian.h inttypes.h locale.h float.h stdint.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-    SECTION_FLAGS='-ffunction-sections -fdata-sections'
-
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_INT64_T 1
-_ACEOF
-
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ACOSF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ASINF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ATANF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ATAN2F 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_CEILF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_COPYSIGN 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_COPYSIGNF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_COSF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_COSHF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_EXPF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FABSF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FINITE 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FINITEF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FLOORF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FMODF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FREXPF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_HYPOT 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_HYPOTF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ISINF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ISINFF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ISNAN 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ISNANF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_LOGF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_LOG10F 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_MODFF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_SINF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_SINHF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_SQRTF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TANF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TANHF 1
-_ACEOF
-
-    ;;
  *-hpux*)
    SECTION_FLAGS='-ffunction-sections -fdata-sections'

--- a/gcc/libstdc++-v3/crossconfig.m4
+++ b/gcc/libstdc++-v3/crossconfig.m4
@@ -114,8 +114,6 @@ case "${host}" in
    AC_DEFINE(HAVE_ATANF)
    AC_DEFINE(HAVE_ATAN2F)
    AC_DEFINE(HAVE_CEILF)
-    AC_DEFINE(HAVE_COPYSIGN)
-    AC_DEFINE(HAVE_COPYSIGNF)
    AC_DEFINE(HAVE_COSF)
    AC_DEFINE(HAVE_COSHF)
    AC_DEFINE(HAVE_EXPF)
@@ -139,6 +137,7 @@ case "${host}" in
    AC_DEFINE(HAVE_SQRTF)
    AC_DEFINE(HAVE_TANF)
    AC_DEFINE(HAVE_TANHF)
+    AC_DEFINE(HAVE_TLS)
    ;;

  *-hpux*)
--- a/gcc/libtool.m4
+++ b/gcc/libtool.m4
@@ -1137,7 +1137,7 @@ fi
 # Invoke $ECHO with all args, space-separated.
 func_echo_all ()
 {
-    $ECHO "$*" 
+    $ECHO "$*"
 }

 case "$ECHO" in
@@ -2184,7 +2184,7 @@ amigaos*)
  esac
  ;;

-beos* | haiku*)
+beos*)
  library_names_spec='${libname}${shared_ext}'
  dynamic_linker="$host_os ld.so"
  shlibpath_var=LIBRARY_PATH
@@ -2342,8 +2342,9 @@ haiku*)
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LIBRARY_PATH
  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
+  sys_lib_search_path_spec='/boot/system/non-packaged/develop/lib /boot/system/develop/lib'
+  sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/system/non-packaged/lib /boot/system/lib'
+  hardcode_into_libs=no
  ;;

 hpux9* | hpux10* | hpux11*)
@@ -2991,7 +2992,7 @@ aix[[4-9]]*)
  lt_cv_deplibs_check_method=pass_all
  ;;

-beos* | haiku*)
+beos*)
  lt_cv_deplibs_check_method=pass_all
  ;;

@@ -3603,7 +3604,7 @@ m4_if([$1], [CXX], [
        ;;
      esac
      ;;
-    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
      # PIC is the default for these OSes.
      ;;
    mingw* | cygwin* | os2* | pw32* | cegcc*)
@@ -3625,8 +3626,6 @@ m4_if([$1], [CXX], [
      ;;
    haiku*)
      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
      ;;
    interix[[3-9]]*)
      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
@@ -3915,7 +3914,7 @@ m4_if([$1], [CXX], [
      esac
      ;;

-    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
      # PIC is the default for these OSes.
      ;;

@@ -3936,8 +3935,6 @@ m4_if([$1], [CXX], [

    haiku*)
      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
      ;;

    hpux*)
@@ -4429,8 +4426,8 @@ _LT_EOF
      ;;

    haiku*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
      ;;

    interix[[3-9]]*)
@@ -5785,8 +5782,8 @@ if test "$_lt_caught_CXX_error" != yes; then
        ;;

      haiku*)
-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-        _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
        ;;

      hpux9*)
--- a/jam/Jambase
+++ b/jam/Jambase
@@ -540,7 +540,7 @@ else if $(UNIX)
 	LEX		?= lex ;
 	LINKFLAGS	?= $(CCFLAGS) ;
 	LINKLIBS	?= ;
-	OPTIM		?= -O ;
+	OPTIM		?= ;
 	RANLIB		?= ranlib ;
 	YACC		?= yacc ;
 	YACCGEN		?= .c ;
--- a/jam/execunix.c
+++ b/jam/execunix.c
@@ -297,7 +297,7 @@ execwait()
 		    break;

 	    if( i == MAXJOBS )
-		printf( "jam: waif child process %ld found, ignoring it!\n", w );
+		printf( "jam: waif child process %d found, ignoring it!\n", w );
 	} while( i == MAXJOBS );

 # ifdef USE_EXECNT
--- a/jam/expand.c
+++ b/jam/expand.c
@@ -81,7 +81,7 @@ var_expand(
 	int depth;

 	if( DEBUG_VAREXP )
-	    printf( "expand '%.*s'\n", end - in, in );
+	    printf( "expand '%.*s'\n", (int)(end - in), in );

 	/* This gets alot of cases: $(<) and $(>) */

--- a/jam/hash.c
+++ b/jam/hash.c
@@ -252,6 +252,6 @@ hashstat( struct hash *hp )
 		hp->items.nel,
 		hp->tab.nel,
 		hp->items.nel * hp->items.size / 1024,
-		hp->tab.nel * sizeof( ITEM ** ) / 1024,
+		(int)(hp->tab.nel * sizeof( ITEM ** ) / 1024),
 		(float)count / (float)sets );
 }
--- a/jam/hcache.c
+++ b/jam/hcache.c
@@ -313,10 +313,10 @@ hcache_done()
 	else if (c->age > maxage)
 	    continue;

-	sprintf(includes_count_str, "%lu", list_length(c->includes));
-	sprintf(hdrscan_count_str, "%lu", list_length(c->hdrscan));
+	sprintf(includes_count_str, "%u", list_length(c->includes));
+	sprintf(hdrscan_count_str, "%u", list_length(c->hdrscan));
 	sprintf(time_str, "%lu", c->time);
-	sprintf(age_str, "%lu", c->age);
+	sprintf(age_str, "%u", c->age);

 	write_netstring(f, CACHE_RECORD_HEADER);
 	write_netstring(f, c->boundname);
--- a/legacy/gcc/gcc/config/i386/haiku.h
+++ b/legacy/gcc/gcc/config/i386/haiku.h
@@ -183,7 +183,7 @@ Boston, MA 02111-1307, USA.  */
 /* If ELF is the default format, we should not use /lib/elf. */

 #undef	LINK_SPEC
-#define LINK_SPEC "%{!o*:-o %b} -m elf_i386_haiku -shared -Bsymbolic " \
+#define LINK_SPEC "%{!o*:-o %b} -m elf_i386_haiku %{!r:-shared} -Bsymbolic " \
 	"%{nostart:-e 0} %{shared:-e 0} %{!shared: %{!nostart: --no-undefined}}"

 /* Provide start and end file specs appropriate to glibc.  */
@@ -199,10 +199,10 @@ Boston, MA 02111-1307, USA.  */
 #define LIBGCC_SPEC ""

 #undef  STARTFILE_SPEC
-#define STARTFILE_SPEC "crti.o%s crtbegin.o%s %{!nostart: %{!shared: start_dyn.o%s}} init_term_dyn.o%s"
+#define STARTFILE_SPEC "crti.o%s crtbeginS.o%s %{!nostart: %{!shared: start_dyn.o%s}} init_term_dyn.o%s"

 #undef  ENDFILE_SPEC
-#define ENDFILE_SPEC "crtend.o%s crtn.o%s"
+#define ENDFILE_SPEC "crtendS.o%s crtn.o%s"

 /* Get perform_* macros to build libgcc.a.  */
 #include "i386/perform.h"
--- a/legacy/gcc/gcc/configure
+++ b/legacy/gcc/gcc/configure
@@ -3588,7 +3588,7 @@ for machine in $build $host $target; do
 		tm_file=i386/haiku.h
 		xmake_file=i386/x-haiku
 		extra_objs=winnt.o
-		extra_parts='crtbegin.o crtend.o'
+		extra_parts='crtbegin.o crtbeginS.o crtend.o crtendS.o'
 		fixincludes=Makefile.in
 		float_format=i386
 		;;
--- a/legacy/gcc/gcc/configure.in
+++ b/legacy/gcc/gcc/configure.in
@@ -306,10 +306,10 @@ AC_CANONICAL_SYSTEM
 # Find the native compiler
 AC_PROG_CC

-# If the native compiler is GCC, we can enable warnings even in stage1.  
+# If the native compiler is GCC, we can enable warnings even in stage1.
 # That's useful for people building cross-compilers, or just running a
 # quick `make'.
-if test "x$GCC" = "xyes"; then 
+if test "x$GCC" = "xyes"; then
  stage1_warn_cflags='$(WARN_CFLAGS)'
 else
  stage1_warn_cflags=""
@@ -424,7 +424,7 @@ GCC_NEED_DECLARATIONS(getrlimit setrlimit, [

 AC_DECL_SYS_SIGLIST

-# mkdir takes a single argument on some systems. 
+# mkdir takes a single argument on some systems.
 GCC_FUNC_MKDIR_TAKES_ONE_ARG

 # File extensions
@@ -528,7 +528,7 @@ changequote([,])dnl

 	tm_file=${cpu_type}/${cpu_type}.h
 	xm_file=${cpu_type}/xm-${cpu_type}.h
-	
+
 	# Common parts for linux-gnu and openbsd systems
 	case $machine in
 	*-*-linux-gnu*)
@@ -537,7 +537,7 @@ changequote([,])dnl
 	*-*-openbsd*)
 		tm_file=${cpu_type}/openbsd.h
 		tmake_file="t-libc-ok t-openbsd"
-		# avoid surprises, always provide an xm-openbsd file 
+		# avoid surprises, always provide an xm-openbsd file
 		xm_file=${cpu_type}/xm-openbsd.h
 		# don't depend on processor x-fragments as well
 		xmake_file=none
@@ -650,7 +650,7 @@ changequote([,])dnl
 		target_cpu_default="MASK_GAS"
 		tmake_file="alpha/t-ieee"
 		;;
-		
+
 	alpha*-dec-osf*)
 		if test x$stabs = xyes
 		then
@@ -809,7 +809,7 @@ changequote([,])dnl
        arm*-*-ecos-elf)
 		tm_file=arm/ecos-elf.h
 		tmake_file=arm/t-elf
-		;; 
+		;;
 	arm*-*-elf)
 		tm_file=arm/unknown-elf.h
 		tmake_file=arm/t-arm-elf
@@ -835,7 +835,7 @@ changequote([,])dnl
 		use_collect2=yes
 		;;
 	c38-convex-*)
-		target_cpu_default=16		
+		target_cpu_default=16
 		use_collect2=yes
 		;;
 	c4x-*)
@@ -1182,7 +1182,7 @@ changequote([,])dnl
 		tm_file=i386/haiku.h
 		xmake_file=i386/x-haiku
 		extra_objs=winnt.o
-		extra_parts='crtbegin.o crtend.o'
+		extra_parts='crtbegin.o crtbeginS.o crtend.o crtendS.o'
 		fixincludes=Makefile.in
 		float_format=i386
 		;;
@@ -1291,8 +1291,8 @@ changequote(,)dnl
 	i[34567]86-*-linux-gnulibc1)	# Intel 80386's running GNU/Linux
 changequote([,])dnl			# with ELF format using the
 					# GNU/Linux C library 5
-		xmake_file=x-linux	
-		tm_file=i386/linux.h	
+		xmake_file=x-linux
+		tm_file=i386/linux.h
 		tmake_file="t-linux t-linux-gnulibc1 i386/t-crtstuff"
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		gnu_ld=yes
@@ -3425,7 +3425,7 @@ changequote([,])dnl
 				target_cpu_default2="MASK_CPU_EV5"
 				;;
 		esac
-				
+
 		if test x$gas = xyes
 		then
 			if test "$target_cpu_default2" = ""
@@ -3693,7 +3693,7 @@ null_defines=
 host_xm_file="auto-host.h gansidecl.h ${host_xm_file} hwint.h"

 # If host=build, it is correct to have hconfig include auto-host.h
-# as well.  If host!=build, we are in error and need to do more 
+# as well.  If host!=build, we are in error and need to do more
 # work to find out the build config parameters.
 if test x$host = x$build
 then
@@ -3702,7 +3702,7 @@ else
 	# We create a subdir, then run autoconf in the subdir.
 	# To prevent recursion we set host and build for the new
 	# invocation of configure to the build for this invocation
-	# of configure. 
+	# of configure.
 	tempdir=build.$$
 	rm -rf $tempdir
 	mkdir $tempdir
@@ -4341,7 +4341,7 @@ fi
 AC_SUBST(build_canonical)
 AC_SUBST(host_canonical)
 AC_SUBST(target_subdir)
-	
+
 # If this is using newlib, then define inhibit_libc in
 # LIBGCC2_CFLAGS.  This will cause __eprintf to be left out of
 # libgcc.a, but that's OK because newib should have its own version of
--- a/legacy/gcc/gcc/version.c
+++ b/legacy/gcc/gcc/version.c
@@ -1 +1 @@
-char *version_string = "2.95.3-haiku-2013_08_15";
+char *version_string = "2.95.3-haiku-2014_07_26";
Author	SHA1	Message	Date
Jessica Hamilton	c700a4fe64	Don't switch on -shared if the user specifies -r. * Follow up to btrev43090, to include platforms missed in original commit.	2014-10-13 04:15:32 +00:00
Nick Smallbone	aeb1fcf62f	Don't switch on -shared if the user specifies -r Signed-off-by: Jessica Hamilton <jessica.l.hamilton@gmail.com>	2014-10-04 14:41:05 +13:00
Paweł Dziepak	862b5480a9	jam: do not set OPTIM by default If setting OPTIM by jam basically makes it impossible for the project that is using jam to set its own optimization level while still allowing user to override that in command line. For example in Haiku jam files there is line like this: "OPTIM ?= -O2", which obviously is meant to set optimization level to O2 unless user overwrites it. Unfortunately, because Jam have already set OPTIM to -O this line never had an intended effect. After this Jam no longer thinks it knows best what is good for projects that are using it and Haiku is by default compiled with -O2. Signed-off-by: Paweł Dziepak <pdziepak@quarnos.org>	2014-08-25 22:58:39 +02:00
Ithamar R. Adema	6f9a8fa02b	ARM/gcc: make LINK_SPEC match our other platforms. It looks like shared/nostart was not properly handled. These changes were copied from the x86_64 specs.	2014-08-21 16:41:43 +02:00
Oliver Tappe	bc712e7525	Fix format-related warnings during build of jam.	2014-08-10 17:16:21 +02:00
Oliver Tappe	e5a1aa929a	Bump version of legacy compiler.	2014-07-28 11:12:44 +02:00
Oliver Tappe	937988f044	Add crtbeginS.o and crtendS.o to configure.in, too.	2014-07-27 19:51:42 +02:00
Oliver Tappe	4947d64591	Fix build failure on m68k and powerpc.	2014-07-26 19:50:18 +02:00
Oliver Tappe	54883b1bb5	Let gcc2 use crtbeginS.o and crtendS.o, too. * I doubt that this makes much of a difference, but it avoids yet another indirection in Haiku's build system.	2014-07-23 09:18:51 +02:00
Oliver Tappe	ec31cc6bfc	Explicitly link libgcc and cleanup search paths. * Adjust the libgcc spec to actually link against libgcc explicitly (it is no longer included in libroot.so on anything except x86_gcc2). * Apply --as-needed when linking against libgcc_s.so * Drop search paths that no longer exist (/boot/common/...).	2014-07-23 09:18:18 +02:00
Oliver Tappe	affbe90c4c	Apply shared-library-related fixes to libtool.m4, too.	2014-07-22 17:07:52 +02:00
Oliver Tappe	9f6654f4a8	Use crtbeginS.o and crtendS.o for everything. * The glue code files crtbegin.o and crtend.o don't cleanup globals properly, only the variants with the S suffix do. As executables are shared on Haiku, we use crtbeginS.o and crtendS.o for those, too. This fixes crashes on shutdown of Haiku servers that load add-ons (e.g. Print Server and Media Add-On Server).	2014-07-22 17:07:45 +02:00
Oliver Tappe	cece7c2f4b	Fix configuration of libstdc++. * The configure script for libstdc++ contained a couple of duplicate 'haiku' case entries, where the first would shadow the second. Correct several incorrect libtool definitions and paths.	2014-07-21 13:08:15 +02:00
Oliver Tappe	7579cd6798	Set missing executable flag on libgcc/configure.	2014-07-21 12:04:06 +02:00
Oliver Tappe	cb83cf1ca3	Adjust configuration for gcc/libgcc. * Gcc will now build libgcc.a, libgcc_eh.a and libgcc_s.so. * Activate thread support for libgcc. * Let libgcc use ELF dwarf2 unwinding on Haiku. * Activate ELF symbol versioning on Haiku. * Activate use of __cxa_atexit * Drop fragments of Haiku support for mipsel	2014-07-21 12:03:51 +02:00
Oliver Tappe	43f1e2dba3	* Add .gitignore.	2014-07-21 11:18:25 +02:00
Jonathan Schleifer	17ba980278	Fix libstdc++ not using TLS when cross compiling	2014-07-19 23:04:37 +02:00
John Scipione	9d26d59ebc	Remove trailing space in comment	2014-07-11 12:04:57 -04:00