Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From f825634a56b119dfa9d712119a66279cc7635978 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> |
| 3 | Date: Sat, 2 May 2015 14:24:02 +0200 |
| 4 | Subject: [PATCH 2/2] Don't pass -m32/-m64 where it's not supported. |
| 5 | |
| 6 | Only PowerPC, SPARC, and x86 do support the -m32 and -m64 compiler options [1]. |
| 7 | |
| 8 | Rather then excluding all architectures not supporting these options as it is |
| 9 | done in commit c0634341d9ee2c02d3a55c91dafb988afc066c49 [2], include all |
| 10 | architectures that do support them. |
| 11 | |
| 12 | This will fix building Boost for the SuperH architecture with Buildroot [3]. |
| 13 | |
| 14 | [1] https://gcc.gnu.org/onlinedocs/gcc/Option-Summary.html |
| 15 | [2] https://github.com/boostorg/build/commit/c0634341d9ee2c02d3a55c91dafb988afc066c49 |
| 16 | [3] http://autobuild.buildroot.net/results/ccd/ccd5c83963032ba49b1627b1dff39e34a9486943/build-end.log |
| 17 | |
| 18 | Upstream-Status: Backport |
| 19 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 20 | |
| 21 | --- |
| 22 | tools/build/src/tools/gcc.jam | 2 +- |
| 23 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 24 | |
| 25 | diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam |
| 26 | index eff95ae..2f6af93 100644 |
| 27 | --- a/tools/build/src/tools/gcc.jam |
| 28 | +++ b/tools/build/src/tools/gcc.jam |
| 29 | @@ -451,7 +451,7 @@ rule setup-address-model ( targets * : sources * : properties * ) |
| 30 | else |
| 31 | { |
| 32 | local arch = [ feature.get-values architecture : $(properties) ] ; |
| 33 | - if $(arch) != arm && $(arch) != mips1 |
| 34 | + if $(arch) = power || $(arch) = sparc || $(arch) = x86 |
| 35 | { |
| 36 | if $(model) = 32 |
| 37 | { |
| 38 | -- |
| 39 | 1.7.9.5 |
| 40 | |