gcc: renamed 5.x recipes.

* update 5.3 patchset to match our repository.
This commit is contained in:
Jerome Duval
2016-03-04 21:57:05 +00:00
parent 2e4c5d7a73
commit 35eb22528a
4 changed files with 57 additions and 11 deletions

View File

@@ -13,7 +13,7 @@ LICENSE="
"
COPYRIGHT="1988-2015 Free Software Foundation, Inc."
PATCHES="gcc5-5.2.0_2015_07_27.patchset"
PATCHES="gcc-5.2.0_2015_07_27.patchset"
ARCHITECTURES="!x86_gcc2 !x86 x86_64 arm"
SECONDARY_ARCHITECTURES="!x86"

View File

@@ -12,7 +12,7 @@ LICENSE="
"
COPYRIGHT="1988-2015 Free Software Foundation, Inc."
PATCHES="gcc5-5.3.0_2015_07_27.patchset"
PATCHES="gcc-5.3.0_2016_02_29.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
SECONDARY_ARCHITECTURES="x86"
@@ -24,7 +24,7 @@ libgccSoVersion="1"
libgccLibVersion="1"
PROVIDES="
gcc5$secondaryArchSuffix = $portVersion compat >= 5
gcc$secondaryArchSuffix = $portVersion compat >= 5
cmd:c++$secondaryArchSuffix = $portVersion compat >= 5
cmd:cc$secondaryArchSuffix = $portVersion compat >= 5
cmd:cpp$secondaryArchSuffix = $portVersion compat >= 5
@@ -304,7 +304,7 @@ distribution. This package contains the shared libraries for the runtime \
loader, so it is required for executing most c/c++ programs."
PROVIDES_syslibs="
gcc5_syslibs$secondaryArchSuffix = $portVersion compat >= 4
gcc_syslibs$secondaryArchSuffix = $portVersion compat >= 4
lib:libgcc_s$secondaryArchSuffix = $portVersion compat >= 4
lib:libstdc++$secondaryArchSuffix = $portVersion compat >= 4
lib:libsupc++$secondaryArchSuffix = $portVersion compat >= 4
@@ -321,6 +321,6 @@ contains the set of gcc's C/C++-runtime libraries and headers that is \
required by Haiku's build system when building Haiku."
PROVIDES_syslibs_devel="
gcc5_syslibs_devel$secondaryArchSuffix = $portVersion compat >= 5
gcc_syslibs_devel$secondaryArchSuffix = $portVersion compat >= 5
"
REQUIRES_syslibs_devel=""

View File

@@ -1,4 +1,4 @@
From c8a741cf5cbc7ad935e389c5a957a739245358f6 Mon Sep 17 00:00:00 2001
From 118a80cf62982a88de0761a01310e86bd7e17c55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Sun, 19 Jul 2015 18:55:34 +0200
Subject: Haiku patch
@@ -2320,10 +2320,10 @@ index 24d13f3..94d96d9 100644
hpux*)
--
2.2.2
2.7.0
From 86053f9a13d76e1e910648a9ec6a70fc30922f4b Mon Sep 17 00:00:00 2001
From 48c3b2e151f903bc45d447deed0539897ff41322 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 10 Dec 2015 22:07:03 +0000
Subject: Haiku: regenerate configure.
@@ -2841,10 +2841,10 @@ index 8cd4c76..d12f460 100755
SECTION_FLAGS='-ffunction-sections -fdata-sections'
--
2.2.2
2.7.0
From 37b7a7a055c1b6a83c920403df101a205b617794 Mon Sep 17 00:00:00 2001
From 9dfa1054ae72a8f2a715ac44c83f375214e4446d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 12 Dec 2015 09:55:48 +0000
Subject: config.host (i[34567]86-*-haiku* and x86_64-*-haiku*):
@@ -2866,5 +2866,51 @@ index dc73f2a..32e3cd2 100644
if test "${host_address}" = 32; then
tmake_file="${tmake_file} i386/${host_address}/t-softfp"
--
2.2.2
2.7.0
From b2e63b86e49e983d9083993c192d6705714286cb Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 29 Feb 2016 22:17:31 +0000
Subject: sync with buildtools repo
diff --git a/gcc/config/haiku.h b/gcc/config/haiku.h
index 2aa4b2b..27bab0a 100644
--- a/gcc/config/haiku.h
+++ b/gcc/config/haiku.h
@@ -46,7 +46,9 @@ Boston, MA 02111-1307, USA. */
user explicitly asks for the warnings with -Wmultichar. Note that
CC1_SPEC is used for both cc1 and cc1plus. */
#undef CC1_SPEC
-#define CC1_SPEC "%{!no-fpic:%{!fno-pic:%{!fno-pie:%{!fpie:%{!fPIC:%{!fPIE:-fpic}}}}}} %{!Wmultichar: -Wno-multichar} %(cc1_cpu) %{profile:-p}"
+#define CC1_SPEC \
+ "%{fpic|fPIC|fpie|fPIE|fno-pic|fno-PIC|fno-pie|fno-PIE:;:-fPIC} \
+ %{!Wmultichar: -Wno-multichar} %(cc1_cpu) %{profile:-p}"
#undef CC1PLUS_SPEC
#define CC1PLUS_SPEC "%{!Wctor-dtor-privacy:-Wno-ctor-dtor-privacy}"
@@ -208,9 +210,6 @@ Boston, MA 02111-1307, USA. */
#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all:-lssp}"
#endif
-/* no JCR_SECTION_NAME default definition for Haiku */
-#define TARGET_NO_JCR_SECTION_NAME 1
-
/* Do not use JCR_SECTION_NAME default definition for Haiku */
#define TARGET_NO_JCR_SECTION_NAME 1
diff --git a/gcc/config/rs6000/haiku.h b/gcc/config/rs6000/haiku.h
index 9ff36f1..4dff89e 100644
--- a/gcc/config/rs6000/haiku.h
+++ b/gcc/config/rs6000/haiku.h
@@ -54,6 +54,3 @@ Boston, MA 02111-1307, USA. */
#undef LINK_SPEC
#define LINK_SPEC "%{!o*:-o %b} -m elf32ppchaiku %{!r:-shared} %{nostart:-e 0} %{shared:-e 0} %{!shared: %{!nostart: -no-undefined}}"
-
-#undef CC1_SPEC
-#define CC1_SPEC "%{!no-fpic:%{!fno-pic:%{!fno-pie:%{!fpie:%{!fPIC:%{!fPIE:-fPIC}}}}}} %{!Wmultichar: -Wno-multichar} %(cc1_cpu) %{profile:-p}"
--
2.7.0