|
From: <sv...@va...> - 2014-09-24 22:03:06
|
Author: florian
Date: Wed Sep 24 22:02:54 2014
New Revision: 14566
Log:
The testbuckets none/tests/ppc{32,64} did not build in case the
toolchain did not support -maltivec -mabi=altivec.
This should work now. Fixes BZ #338731
Modified:
trunk/NEWS
trunk/none/tests/ppc32/Makefile.am
trunk/none/tests/ppc64/Makefile.am
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Wed Sep 24 22:02:54 2014
@@ -27,6 +27,7 @@
https://bugs.kde.org/show_bug.cgi?id=XXXXXX
where XXXXXX is the bug number as listed below.
+338731 ppc: Fix testuite build for toolchains not supporting -maltivec
339020 ppc64: memcheck/tests/ppc64/power_ISA2_05 failing in nightly build
339156 - gdbsrv not called for fatal signal
n-i-bz Old STABS code is still being compiled, but never used. Remove it.
Modified: trunk/none/tests/ppc32/Makefile.am
==============================================================================
--- trunk/none/tests/ppc32/Makefile.am (original)
+++ trunk/none/tests/ppc32/Makefile.am Wed Sep 24 22:02:54 2014
@@ -72,8 +72,12 @@
allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
if HAS_ALTIVEC
+BUILD_FLAG_ALTIVEC = -maltivec
+BUILD_FLAG_ABI_ALTIVEC = -mabi=altivec
ALTIVEC_FLAG = -DHAS_ALTIVEC
else
+BUILD_FLAG_ALTIVEC =
+BUILD_FLAG_ABI_ALTIVEC =
ALTIVEC_FLAG =
endif
@@ -101,11 +105,12 @@
ISA_2_07_FLAG =
endif
-jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec \
- @FLAG_M32@ $(ALTIVEC_FLAG)
+jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames \
+ @FLAG_M32@ $(ALTIVEC_FLAG) $(BUILD_FLAG_ALTIVEC)
-testVMX_CFLAGS = $(AM_CFLAGS) -O -g -Wall -maltivec -mabi=altivec -DALTIVEC \
- -DGCC_COMPILER @FLAG_M32@
+testVMX_CFLAGS = $(AM_CFLAGS) -O -g -Wall -DALTIVEC \
+ -DGCC_COMPILER @FLAG_M32@ $(BUILD_FLAG_ALTIVEC) \
+ $(BUILD_FLAG_ABI_ALTIVEC)
test_isa_2_06_part1_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(VSX_FLAG) \
@FLAG_M32@ $(ALTIVEC_FLAG) $(BUILD_FLAG_VSX)
Modified: trunk/none/tests/ppc64/Makefile.am
==============================================================================
--- trunk/none/tests/ppc64/Makefile.am (original)
+++ trunk/none/tests/ppc64/Makefile.am Wed Sep 24 22:02:54 2014
@@ -50,8 +50,10 @@
allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
if HAS_ALTIVEC
+BUILD_FLAG_ALTIVEC = -maltivec
ALTIVEC_FLAG = -DHAS_ALTIVEC
else
+BUILD_FLAG_ALTIVEC =
ALTIVEC_FLAG =
endif
@@ -88,8 +90,8 @@
test_isa_2_06_part3_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(VSX_FLAG) \
@FLAG_M64@ $(ALTIVEC_FLAG) $(BUILD_FLAG_VSX)
-jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec \
- @FLAG_M64@ $(ALTIVEC_FLAG)
+jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames \
+ @FLAG_M64@ $(ALTIVEC_FLAG) $(BUILD_FLAG_ALTIVEC)
test_dfp1_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(DFP_FLAG) \
@FLAG_M64@ $(BUILD_FLAGS_DFP)
|