From ac9c3b70052ef259d3c2d16f61f098467eee4c5d Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sun, 03 Jun 2018 12:11:59 -0400 Subject: [PATCH] Further synchronization with HaikuPorts patches. --- gcc/libtool.m4 | 14 +++++--------- gcc/gcc/configure | 52 ++++++++++++++++++++++++++++++++++++++++++++-------- gcc/gcc/configure.ac | 21 +++++++++++++++++++++ 3 files changed, 62 insertions(+), 25 deletions(-) diff --git a/gcc/libtool.m4 b/gcc/libtool.m4 index 615cd59..94d96d9 100644 --- a/gcc/libtool.m4 +++ b/gcc/libtool.m4 @@ -1137,7 +1137,7 @@ # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } case "$ECHO" in @@ -1722,7 +1722,7 @@ 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 @@ -2342,8 +2342,9 @@ 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/beos/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*) @@ -3603,7 +3604,6 @@ ;; esac ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; @@ -3626,8 +3626,6 @@ ;; 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. @@ -3937,8 +3935,6 @@ haiku*) # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= ;; hpux*) diff --git a/gcc/gcc/configure b/gcc/gcc/configure index 9ce728f..487601c 100755 --- a/gcc/gcc/configure +++ b/gcc/gcc/configure @@ -747,6 +747,7 @@ EXTRA_GCC_LIBS GNAT_LIBEXC COLLECT2_LIBS +build_math_library CXXDEPMODE DEPDIR am__leading_dot @@ -783,6 +784,7 @@ with_cpu enable_multiarch enable_multilib +HYBRID_SECONDARY coverage_flags valgrind_command valgrind_path_defines @@ -899,6 +901,7 @@ enable_coverage enable_gather_detailed_mem_stats enable_valgrind_annotations +with_hybrid_secondary with_stabs enable_multilib enable_multiarch @@ -1714,6 +1717,8 @@ --with-demangler-in-ld try to use demangler in GNU ld --with-gnu-as arrange to work with GNU as --with-as arrange to use the specified as (full pathname) + --with-hybrid_secondary specify the packaging architecture for building a + secondary compiler for a Haiku hybrid system --with-stabs arrange to use stabs instead of host debug format --with-dwarf2 force the default debug format to be DWARF 2 --with-specs=SPECS add SPECS to driver command-line processing @@ -7373,6 +7378,18 @@ # Miscenalleous configure options # ------------------------------- +# handle --with-hybrid-secondary + +# Check whether --with-hybrid_secondary was given. +if test "${with_hybrid_secondary+set}" = set; then : + withval=$with_hybrid_secondary; HYBRID_SECONDARY=$withval +else + HYBRID_SECONDARY= + +fi + + + # With stabs # Check whether --with-stabs was given. @@ -9378,8 +9395,18 @@ # -------- # UNSORTED # -------- + +# Configure -lm usage for host tools that need it +build_math_library="-lm" +case $build in + *-*-haiku*) + # no separate math library needed + build_math_library= + ;; +esac + # These libraries may be used by collect2. # We may need a special search path to get them linked. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for collect2 libraries" >&5 @@ -11680,7 +11707,7 @@ # default target_thread_file='single' ;; - aix | dce | lynx | mipssde | posix | rtems | \ + aix | dce | haiku | lynx | mipssde | posix | rtems | \ single | tpf | vxworks | win32) target_thread_file=${enable_threads} ;; @@ -15524,8 +15551,6 @@ haiku*) # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - lt_prog_compiler_static= ;; hpux*) @@ -17637,8 +17662,9 @@ 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/beos/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*) @@ -18155,7 +18181,7 @@ lt_cv_dlopen_libs= case $host_os in - beos*) + beos* | haiku* ) lt_cv_dlopen="load_add_on" lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -18433,7 +18459,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18436 "configure" +#line 18462 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18539,7 +18565,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18542 "configure" +#line 18568 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -20353,7 +20379,6 @@ ;; esac ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; @@ -20375,8 +20400,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. @@ -21297,8 +21320,9 @@ 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/beos/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*) @@ -25217,7 +25241,6 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for SPARC6 instructions" >&5 $as_echo_n "checking assembler for SPARC6 instructions... " >&6; } if test "${gcc_cv_as_sparc_sparc6+set}" = set; then : @@ -25253,7 +25276,6 @@ $as_echo "#define HAVE_AS_SPARC6 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for LEON instructions" >&5 $as_echo_n "checking assembler for LEON instructions... " >&6; } diff --git a/gcc/gcc/configure.ac b/gcc/gcc/configure.ac index 2b52da3..acf8701 100644 --- a/gcc/gcc/configure.ac +++ b/gcc/gcc/configure.ac @@ -771,6 +771,15 @@ # Miscenalleous configure options # ------------------------------- +# handle --with-hybrid-secondary +AC_ARG_WITH(hybrid_secondary, + [AS_HELP_STRING([--with-hybrid_secondary], + [specify the packaging architecture for building a secondary compiler for a Haiku hybrid system])], + [HYBRID_SECONDARY=$withval], + [HYBRID_SECONDARY=] +) +AC_SUBST(HYBRID_SECONDARY) + # With stabs AC_ARG_WITH(stabs, [AS_HELP_STRING([--with-stabs], @@ -1154,6 +1163,16 @@ # UNSORTED # -------- + +# Configure -lm usage for host tools that need it +build_math_library="-lm" +case $build in + *-*-haiku*) + # no separate math library needed + build_math_library= + ;; +esac +AC_SUBST(build_math_library) # These libraries may be used by collect2. # We may need a special search path to get them linked. @@ -1611,7 +1630,7 @@ # default target_thread_file='single' ;; - aix | dce | lynx | mipssde | posix | rtems | \ + aix | dce | haiku | lynx | mipssde | posix | rtems | \ single | tpf | vxworks | win32) target_thread_file=${enable_threads} ;; -- gitore 0.2.2