| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Backport |
| 2 | |
| 3 | r14566 | florian | 2014-09-24 17:02:54 -0500 (Wed, 24 Sep 2014) | 4 lines |
| 4 | |
| 5 | The testbuckets none/tests/ppc{32,64} did not build in case the |
| 6 | toolchain did not support -maltivec -mabi=altivec. |
| 7 | This should work now. Fixes BZ #338731 |
| 8 | |
| 9 | Index: none/tests/ppc32/Makefile.am |
| 10 | =================================================================== |
| 11 | --- a/none/tests/ppc32/Makefile.am (revision 14565) |
| 12 | +++ b/none/tests/ppc32/Makefile.am (revision 14566) |
| 13 | @@ -72,8 +72,12 @@ |
| 14 | allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@ |
| 15 | |
| 16 | if HAS_ALTIVEC |
| 17 | +BUILD_FLAG_ALTIVEC = -maltivec |
| 18 | +BUILD_FLAG_ABI_ALTIVEC = -mabi=altivec |
| 19 | ALTIVEC_FLAG = -DHAS_ALTIVEC |
| 20 | else |
| 21 | +BUILD_FLAG_ALTIVEC = |
| 22 | +BUILD_FLAG_ABI_ALTIVEC = |
| 23 | ALTIVEC_FLAG = |
| 24 | endif |
| 25 | |
| 26 | @@ -101,11 +105,12 @@ |
| 27 | ISA_2_07_FLAG = |
| 28 | endif |
| 29 | |
| 30 | -jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec \ |
| 31 | - @FLAG_M32@ $(ALTIVEC_FLAG) |
| 32 | +jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames \ |
| 33 | + @FLAG_M32@ $(ALTIVEC_FLAG) $(BUILD_FLAG_ALTIVEC) |
| 34 | |
| 35 | -testVMX_CFLAGS = $(AM_CFLAGS) -O -g -Wall -maltivec -mabi=altivec -DALTIVEC \ |
| 36 | - -DGCC_COMPILER @FLAG_M32@ |
| 37 | +testVMX_CFLAGS = $(AM_CFLAGS) -O -g -Wall -DALTIVEC \ |
| 38 | + -DGCC_COMPILER @FLAG_M32@ $(BUILD_FLAG_ALTIVEC) \ |
| 39 | + $(BUILD_FLAG_ABI_ALTIVEC) |
| 40 | |
| 41 | test_isa_2_06_part1_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(VSX_FLAG) \ |
| 42 | @FLAG_M32@ $(ALTIVEC_FLAG) $(BUILD_FLAG_VSX) |
| 43 | Index: none/tests/ppc64/Makefile.am |
| 44 | =================================================================== |
| 45 | --- a/none/tests/ppc64/Makefile.am (revision 14565) |
| 46 | +++ b/none/tests/ppc64/Makefile.am (revision 14566) |
| 47 | @@ -50,8 +50,10 @@ |
| 48 | allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@ |
| 49 | |
| 50 | if HAS_ALTIVEC |
| 51 | +BUILD_FLAG_ALTIVEC = -maltivec |
| 52 | ALTIVEC_FLAG = -DHAS_ALTIVEC |
| 53 | else |
| 54 | +BUILD_FLAG_ALTIVEC = |
| 55 | ALTIVEC_FLAG = |
| 56 | endif |
| 57 | |
| 58 | @@ -88,8 +90,8 @@ |
| 59 | test_isa_2_06_part3_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(VSX_FLAG) \ |
| 60 | @FLAG_M64@ $(ALTIVEC_FLAG) $(BUILD_FLAG_VSX) |
| 61 | |
| 62 | -jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec \ |
| 63 | - @FLAG_M64@ $(ALTIVEC_FLAG) |
| 64 | +jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames \ |
| 65 | + @FLAG_M64@ $(ALTIVEC_FLAG) $(BUILD_FLAG_ALTIVEC) |
| 66 | |
| 67 | test_dfp1_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(DFP_FLAG) \ |
| 68 | @FLAG_M64@ $(BUILD_FLAGS_DFP) |