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.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12556

diff --git a/Makefile.tool-tests.am b/Makefile.tool-tests.am
index 79110dfd3e1c0c72fc8e7aa59d026a79311b2e55..da07ec7338a161b30ee8c3953eeb4ab5e98df262 100644 (file)
--- a/Makefile.tool-tests.am
+++ b/Makefile.tool-tests.am
@@ -9,6 +9,12 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \
                -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

diff --git a/NEWS b/NEWS
index 7fbeddf26a11401992b69bcdd6ba37feb0bc9d61..d87487466ca73b749f7fc2b032d3ae7334691149 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -78,6 +78,7 @@ where XXXXXX is the bug number as listed below.
 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

diff --git a/tests/arch_test.c b/tests/arch_test.c
index 4263c89b674232c98e36d63cf0c7e44accaf499e..6f3d944e29eef816a9793fca7f116e1d143116af 100644 (file)
--- a/tests/arch_test.c
+++ b/tests/arch_test.c
@@ -38,7 +38,9 @@ static Bool go(char* arch)
    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 @@ static Bool go(char* arch)
 
 #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;