diff options
Diffstat (limited to 'meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch')
-rw-r--r-- | meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch index 8944cb37b4..68d6e6417f 100644 --- a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +++ b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3e4eb02eb5951058bc6f8dffbf049eb189df8291 Mon Sep 17 00:00:00 2001 | 1 | From f4d3fad43d67808d71325ba0df1457555b9a0086 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 18 Dec 2018 15:42:57 +0100 | 3 | Date: Tue, 18 Dec 2018 15:42:57 +0100 |
4 | Subject: [PATCH] Don't set up arch/instruction-set flags, we do that ourselves | 4 | Subject: [PATCH] Don't set up arch/instruction-set flags, we do that ourselves |
@@ -6,15 +6,16 @@ Subject: [PATCH] Don't set up arch/instruction-set flags, we do that ourselves | |||
6 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
7 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | 7 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
9 | |||
9 | --- | 10 | --- |
10 | tools/build/src/tools/gcc.jam | 128 ---------------------------------- | 11 | tools/build/src/tools/gcc.jam | 132 ---------------------------------- |
11 | 1 file changed, 128 deletions(-) | 12 | 1 file changed, 132 deletions(-) |
12 | 13 | ||
13 | diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam | 14 | diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam |
14 | index c57c773f..28618fb1 100644 | 15 | index b9bb9cf2a..c7e3cf3fe 100644 |
15 | --- a/tools/build/src/tools/gcc.jam | 16 | --- a/tools/build/src/tools/gcc.jam |
16 | +++ b/tools/build/src/tools/gcc.jam | 17 | +++ b/tools/build/src/tools/gcc.jam |
17 | @@ -1152,131 +1152,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : | 18 | @@ -1180,135 +1180,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : |
18 | <architecture>$(architecture)/<instruction-set>$(instruction-set) | 19 | <architecture>$(architecture)/<instruction-set>$(instruction-set) |
19 | : $(values) ; | 20 | : $(values) ; |
20 | } | 21 | } |
@@ -144,5 +145,9 @@ index c57c773f..28618fb1 100644 | |||
144 | -cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ; | 145 | -cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ; |
145 | -cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ; | 146 | -cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ; |
146 | -cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ; | 147 | -cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ; |
148 | -cpu-flags gcc OPTIONS : s390x : z196 : -march=z196 ; | ||
149 | -cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ; | ||
150 | -cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ; | ||
151 | -cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ; | ||
147 | -# AIX variant of RS/6000 & PowerPC | 152 | -# AIX variant of RS/6000 & PowerPC |
148 | -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; | 153 | -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; |