Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 1 | From e4d3a7470b307693660d0412732e7266d1738d8c Mon Sep 17 00:00:00 2001 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 2 | From: Christopher Larson <chris_larson@mentor.com> |
| 3 | Date: Tue, 13 Dec 2016 10:29:17 -0700 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 4 | Subject: [PATCH 6/6] Don't set up -m32/-m64, we do that ourselves |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Inappropriate |
| 7 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 8 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 9 | --- |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 10 | tools/build/src/tools/gcc.jam | 39 --------------------------------------- |
| 11 | 1 file changed, 39 deletions(-) |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 12 | |
| 13 | diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 14 | index e4fc6c32..37914fd0 100644 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 15 | --- a/tools/build/src/tools/gcc.jam |
| 16 | +++ b/tools/build/src/tools/gcc.jam |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 17 | @@ -337,45 +337,6 @@ rule set-address-model-options ( targets * : sources * : properties * ) |
| 18 | { |
| 19 | local option ; |
| 20 | local target-os = [ feature.get-values target-os : $(properties) ] ; |
| 21 | - if $(target-os) = aix |
| 22 | - { |
| 23 | - if $(model) = 32 |
| 24 | - { |
| 25 | - option = -maix32 ; |
| 26 | - } |
| 27 | - else |
| 28 | - { |
| 29 | - option = -maix64 ; |
| 30 | - } |
| 31 | - } |
| 32 | - else if $(target-os) = hpux |
| 33 | - { |
| 34 | - if $(model) = 32 |
| 35 | - { |
| 36 | - option = -milp32 ; |
| 37 | - } |
| 38 | - else |
| 39 | - { |
| 40 | - option = -mlp64 ; |
| 41 | - } |
| 42 | - } |
| 43 | - else |
| 44 | - { |
| 45 | - local arch = [ feature.get-values architecture : $(properties) ] ; |
| 46 | - if $(arch) = power || $(arch) = sparc || $(arch) = x86 |
| 47 | - { |
| 48 | - if $(model) = 32 |
| 49 | - { |
| 50 | - option = -m32 ; |
| 51 | - } |
| 52 | - else if $(model) = 64 |
| 53 | - { |
| 54 | - option = -m64 ; |
| 55 | - } |
| 56 | - } |
| 57 | - # For darwin, the model can be 32_64. darwin.jam will handle that |
| 58 | - # on its own. |
| 59 | - } |
| 60 | OPTIONS on $(targets) += $(option) ; |
| 61 | } |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 62 | } |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 63 | -- |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 64 | 2.15.1 |
| 65 | |