From aa8cc20ef2721975d07e7a13a6d5ea372eb4319b Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 30 Jul 2015 20:48:54 +0000 Subject: [PATCH] gcc: update patches for 5.2 and 6.0. --- .../patches/gcc5-5.2.0_2015_07_27.patchset | 28 ++--------- .../patches/gcc6-6.0.0_2015_07_17.patchset | 49 +++++++------------ 2 files changed, 23 insertions(+), 54 deletions(-) diff --git a/sys-devel/gcc/patches/gcc5-5.2.0_2015_07_27.patchset b/sys-devel/gcc/patches/gcc5-5.2.0_2015_07_27.patchset index 119c3c423..4cf991223 100644 --- a/sys-devel/gcc/patches/gcc5-5.2.0_2015_07_27.patchset +++ b/sys-devel/gcc/patches/gcc5-5.2.0_2015_07_27.patchset @@ -1,4 +1,4 @@ -From 616617695ba0ae64d824482e27c38dbaf080b305 Mon Sep 17 00:00:00 2001 +From 35da60e9dc98c57971809054ffe5da0f615a1c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sun, 19 Jul 2015 18:55:34 +0200 Subject: [PATCH 1/2] Haiku patch @@ -31,7 +31,7 @@ Subject: [PATCH 1/2] Haiku patch gcc/ginclude/stddef.h | 10 +- include/filenames.h | 2 + libgcc/Makefile.in | 6 + - libgcc/config.host | 30 ++- + libgcc/config.host | 26 ++ libgcc/config/i386/t-cygming | 0 libgcc/config/t-haiku | 3 + libgcc/crtstuff.c | 2 + @@ -44,7 +44,7 @@ Subject: [PATCH 1/2] Haiku patch libstdc++-v3/crossconfig.m4 | 41 ++++ libstdc++-v3/libsupc++/tinfo.cc | 9 + libtool.m4 | 14 +- - 40 files changed, 1757 insertions(+), 38 deletions(-) + 40 files changed, 1755 insertions(+), 36 deletions(-) mode change 100755 => 100644 compile create mode 100644 gcc/config/arm/haiku.h create mode 100644 gcc/config/arm/t-haiku @@ -1559,18 +1559,9 @@ index 88ddfea..651e6e2 100644 ifneq (,$(vis_hide)) diff --git a/libgcc/config.host b/libgcc/config.host -index 308e4ff..d45ccee 100644 +index 308e4ff..545d628 100644 --- a/libgcc/config.host +++ b/libgcc/config.host -@@ -99,7 +99,7 @@ arm*-*-*) - ;; - avr-*-*) - cpu_type=avr -- ;; -+ ;; - bfin*-*) - cpu_type=bfin - ;; @@ -228,6 +228,14 @@ case ${host} in ;; esac @@ -1612,15 +1603,6 @@ index 308e4ff..d45ccee 100644 i[34567]86-*-netbsdelf*) ;; x86_64-*-netbsd*) -@@ -764,7 +784,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 - ;; @@ -781,6 +801,8 @@ m32r-*-linux*) m32rle-*-linux*) tmake_file="$tmake_file m32r/t-linux t-fdpbit" @@ -2404,7 +2386,7 @@ index 4b2d30a..47ff8f5 100644 -- 2.1.0 -From 682905a32317b593cd438e51702d1f0759f2aab3 Mon Sep 17 00:00:00 2001 +From e4114a4c52a1c7a9d67008a9f4e498e353641fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 27 Jul 2015 17:08:38 +0200 Subject: [PATCH 2/2] Haiku: regenerate configure. diff --git a/sys-devel/gcc/patches/gcc6-6.0.0_2015_07_17.patchset b/sys-devel/gcc/patches/gcc6-6.0.0_2015_07_17.patchset index 3dce3d818..9ce60cb07 100644 --- a/sys-devel/gcc/patches/gcc6-6.0.0_2015_07_17.patchset +++ b/sys-devel/gcc/patches/gcc6-6.0.0_2015_07_17.patchset @@ -1,4 +1,4 @@ -From 2dad18e402ac13ec74ab93e07e9f1b3690e5eb6b Mon Sep 17 00:00:00 2001 +From 5db4a7874f59be390ff30ddd0d44cb606ef36b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sun, 19 Jul 2015 18:55:34 +0200 Subject: [PATCH 1/3] Haiku patch @@ -31,20 +31,20 @@ Subject: [PATCH 1/3] Haiku patch gcc/ginclude/stddef.h | 10 +- include/filenames.h | 2 + libgcc/Makefile.in | 6 + - libgcc/config.host | 30 ++- + libgcc/config.host | 26 ++ libgcc/config/i386/t-cygming | 0 libgcc/config/t-haiku | 3 + libgcc/crtstuff.c | 2 + libstdc++-v3/config/os/haiku/ctype_base.h | 61 +++++ .../config/os/haiku/ctype_configure_char.cc | 99 ++++++++ - libstdc++-v3/config/os/haiku/ctype_inline.h | 168 +++++++++++++ + libstdc++-v3/config/os/haiku/ctype_inline.h | 173 +++++++++++++ libstdc++-v3/config/os/haiku/error_constants.h | 178 ++++++++++++++ libstdc++-v3/config/os/haiku/os_defines.h | 45 ++++ libstdc++-v3/configure.host | 3 + libstdc++-v3/crossconfig.m4 | 41 ++++ libstdc++-v3/libsupc++/tinfo.cc | 9 + libtool.m4 | 14 +- - 40 files changed, 1757 insertions(+), 38 deletions(-) + 40 files changed, 1760 insertions(+), 36 deletions(-) mode change 100755 => 100644 compile create mode 100644 gcc/config/arm/haiku.h create mode 100644 gcc/config/arm/t-haiku @@ -1559,18 +1559,9 @@ index 527d87b..37231e7 100644 ifneq (,$(vis_hide)) diff --git a/libgcc/config.host b/libgcc/config.host -index 3a2c75d..2ed565c 100644 +index 3a2c75d..1266e17 100644 --- a/libgcc/config.host +++ b/libgcc/config.host -@@ -99,7 +99,7 @@ arm*-*-*) - ;; - avr-*-*) - cpu_type=avr -- ;; -+ ;; - bfin*-*) - cpu_type=bfin - ;; @@ -230,6 +230,14 @@ case ${host} in ;; esac @@ -1612,15 +1603,6 @@ index 3a2c75d..2ed565c 100644 i[34567]86-*-netbsdelf*) ;; x86_64-*-netbsd*) -@@ -778,7 +798,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 - ;; @@ -795,6 +815,8 @@ m32r-*-linux*) m32rle-*-linux*) tmake_file="$tmake_file m32r/t-linux t-fdpbit" @@ -1676,13 +1658,13 @@ index f37e464..c52930d 100644 # if !defined(__UCLIBC__) \ diff --git a/libstdc++-v3/config/os/haiku/ctype_base.h b/libstdc++-v3/config/os/haiku/ctype_base.h new file mode 100644 -index 0000000..288e1ff +index 0000000..e762aaa --- /dev/null +++ b/libstdc++-v3/config/os/haiku/ctype_base.h @@ -0,0 +1,61 @@ +// Locale support -*- C++ -*- + -+// Copyright (C) 1997-2013 Free Software Foundation, Inc. ++// Copyright (C) 1997-2015 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the @@ -1848,13 +1830,13 @@ index 0000000..35e6b80 +} // namespace diff --git a/libstdc++-v3/config/os/haiku/ctype_inline.h b/libstdc++-v3/config/os/haiku/ctype_inline.h new file mode 100644 -index 0000000..0419139 +index 0000000..5b5cc56 --- /dev/null +++ b/libstdc++-v3/config/os/haiku/ctype_inline.h -@@ -0,0 +1,168 @@ +@@ -0,0 +1,173 @@ +// Locale support -*- C++ -*- + -+// Copyright (C) 2000-2013 Free Software Foundation, Inc. ++// Copyright (C) 2000-2015 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the @@ -1951,6 +1933,11 @@ index 0000000..0419139 + case graph: + __testis = isgraph(__c); + break; ++#if __cplusplus >= 201103L ++ case blank: ++ __testis = isblank(__c); ++ break; ++#endif + default: + __testis = false; + break; @@ -1971,7 +1958,7 @@ index 0000000..0419139 + *__vec++ = _M_table[static_cast(*__low++)]; + else + { -+ // Highest bitmask in ctype_base == 10. ++ // Highest bitmask in ctype_base == 11. + const size_t __bitmasksize = 15; + for (;__low < __high; ++__vec, ++__low) + { @@ -2404,7 +2391,7 @@ index 4b2d30a..47ff8f5 100644 -- 2.1.0 -From 27eb21c5daeff1754943be89313d8e821890e4e8 Mon Sep 17 00:00:00 2001 +From db57b7204ca279b369b5bd2c1c5cbecaf2883408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 21 Jul 2015 18:45:53 +0200 Subject: [PATCH 2/3] Haiku: regenerate configure. @@ -2902,7 +2889,7 @@ index e9521d6..fbb543a 100755 -- 2.1.0 -From 118753e9e20e1bd0ee46392be3cb92b34a4d35f8 Mon Sep 17 00:00:00 2001 +From 8db0be72e0de7b60f741796967bf6f2ef59fe630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 27 Jul 2015 16:32:32 +0200 Subject: [PATCH 3/3] Haiku: disable -fno-PIE as this fails on x86_64.