From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 25 May 2008 16:43:15 +0000 (+0000)
Subject: #define HAS_ALTIVEC is now fetched from config.h instead of from Makefile.am.
X-Git-Tag: svn/VALGRIND_3_4_0~556
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1a3645bf9a33f44b9015602cc933feaad7ea665;p=thirdparty%2Fvalgrind.git

#define HAS_ALTIVEC is now fetched from config.h instead of from Makefile.am.

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

diff --git a/none/tests/ppc32/Makefile.am b/none/tests/ppc32/Makefile.am
index 1ed0703452..c593d580bd 100644
--- a/none/tests/ppc32/Makefile.am
+++ b/none/tests/ppc32/Makefile.am
@@ -31,7 +31,6 @@ AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g -I$(top_srcdir)/include \
 		@FLAG_M32@
 AM_CXXFLAGS = $(AM_CFLAGS) @FLAG_M32@
 
-jm_insns_CFLAGS = -Winline -Wall -O -mregnames \
-			-DHAS_ALTIVEC -maltivec @FLAG_M32@
+jm_insns_CFLAGS = -Winline -Wall -O -mregnames -maltivec @FLAG_M32@
 testVMX_CFLAGS  = -O -g -Wall -maltivec -mabi=altivec -DALTIVEC \
 			-DGCC_COMPILER @FLAG_M32@
diff --git a/none/tests/ppc32/jm-insns.c b/none/tests/ppc32/jm-insns.c
index 281ae114bf..d55c8751a4 100644
--- a/none/tests/ppc32/jm-insns.c
+++ b/none/tests/ppc32/jm-insns.c
@@ -2,9 +2,9 @@
 /* HOW TO COMPILE:
 
 * 32bit build:
-   gcc -Winline -Wall -g -O -mregnames -DHAS_ALTIVEC -maltivec
+   gcc -Winline -Wall -g -O -mregnames -maltivec
 * 64bit build:
-   gcc -Winline -Wall -g -O -mregnames -DHAS_ALTIVEC -maltivec -m64
+   gcc -Winline -Wall -g -O -mregnames -maltivec -m64
 
 This program is useful, but the register usage conventions in
 it are a complete dog.  In particular, _patch_op_imm has to
@@ -219,7 +219,8 @@ register HWord_t r15 __asm__ ("r15");
 register HWord_t r16 __asm__ ("r16");
 register HWord_t r17 __asm__ ("r17");
 
-#if defined (HAS_ALTIVEC)
+#include "config.h"
+#if defined (HAVE_ALTIVEC_H)
 #   include <altivec.h>
 #endif
 #include <assert.h>
diff --git a/none/tests/ppc64/Makefile.am b/none/tests/ppc64/Makefile.am
index 2f0892a6ae..2bd2d96d4d 100644
--- a/none/tests/ppc64/Makefile.am
+++ b/none/tests/ppc64/Makefile.am
@@ -18,5 +18,4 @@ AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g -I$(top_srcdir)/include \
 		@FLAG_M64@
 AM_CXXFLAGS = $(AM_CFLAGS) @FLAG_M64@
 
-jm_insns_CFLAGS = -Winline -Wall -O -mregnames -DHAS_ALTIVEC -maltivec \
-			@FLAG_M64@
+jm_insns_CFLAGS = -Winline -Wall -O -mregnames -maltivec @FLAG_M64@