|
From: <sv...@va...> - 2012-05-06 03:51:11
|
florian 2012-05-06 04:51:00 +0100 (Sun, 06 May 2012)
New Revision: 12556
Log:
Avoid regtest failures on x86_64 and ppc64 when toolchains for the
seconday platform (x86 and ppc32, respectively) is not available.
Add -DVGA_SEC_xxxxx and -DVGP_SEC_... to the GCC command line
indicating that a seconday platform is supported. Make arch_test.c
recognise those flags.
Fixes bugzilla #296983.
Modified files:
trunk/Makefile.tool-tests.am
trunk/NEWS
trunk/tests/arch_test.c
Modified: trunk/Makefile.tool-tests.am (+6 -0)
===================================================================
--- trunk/Makefile.tool-tests.am 2012-05-06 04:37:25 +01:00 (rev 12555)
+++ trunk/Makefile.tool-tests.am 2012-05-06 04:51:00 +01:00 (rev 12556)
@@ -9,6 +9,12 @@
-DVGO_@VGCONF_OS@=1 \
-DVGP_@VGCONF_ARCH_PRI@_@VGCONF_OS@=1 \
-DVGPV_@VGCONF_ARCH_PRI@_@VGCONF_OS@_@VGCONF_PLATVARIANT@=1
+
+if VGCONF_HAVE_PLATFORM_SEC
+AM_CPPFLAGS += -DVGA_SEC_@VGCONF_ARCH_SEC@=1 \
+ -DVGP_SEC_@VGCONF_ARCH_PRI@_@VGCONF_OS@=1
+endif
+
# Nb: Tools need to augment these flags with an arch-selection option, such
# as $(AM_FLAG_M3264_PRI).
AM_CFLAGS = -Winline -Wall -Wshadow -g
Modified: trunk/tests/arch_test.c (+4 -0)
===================================================================
--- trunk/tests/arch_test.c 2012-05-06 04:37:25 +01:00 (rev 12555)
+++ trunk/tests/arch_test.c 2012-05-06 04:51:00 +01:00 (rev 12556)
@@ -38,7 +38,9 @@
if ( 0 == strcmp( arch, "x86" ) ) return True;
#elif defined(VGP_amd64_linux) || defined(VGP_amd64_darwin)
+#if defined(VGA_SEC_x86)
if ( 0 == strcmp( arch, "x86" ) ) return True;
+#endif
if ( 0 == strcmp( arch, "amd64" ) ) return True;
#elif defined(VGP_ppc32_linux)
@@ -46,7 +48,9 @@
#elif defined(VGP_ppc64_linux)
if ( 0 == strcmp( arch, "ppc64" ) ) return True;
+#if defined(VGA_SEC_ppc32)
if ( 0 == strcmp( arch, "ppc32" ) ) return True;
+#endif
#elif defined(VGP_s390x_linux)
if ( 0 == strcmp( arch, "s390x" ) ) return True;
Modified: trunk/NEWS (+1 -0)
===================================================================
--- trunk/NEWS 2012-05-06 04:37:25 +01:00 (rev 12555)
+++ trunk/NEWS 2012-05-06 04:51:00 +01:00 (rev 12556)
@@ -78,6 +78,7 @@
294055 regtest none/tests/shell fails when locale is not set to C
294190 --vgdb-error=xxx can be out of sync with errors shown to the user
295799 Missing \n with get_vbits in gdbserver when line is % 80 and there are some unaddressable bytes
+296983 Fix build issues on x86_64/ppc64 without 32-bit toolchains
n-i-bz s390x: Shadow registers can now be examined using vgdb
297078 gdbserver signal handling problems caused by diff vki nr/gdb nr
and non reset of "C-ontinued" signal
|