[PATCH 15/16] virtex4: Move -Dxxx to configure.ac

[Joel Sherrill]

Updates #3425.
---
 bsps/powerpc/virtex4/config/virtex4.cfg       | 2 +-
 c/src/lib/libbsp/powerpc/virtex4/configure.ac | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bsps/powerpc/virtex4/config/virtex4.cfg b/bsps/powerpc/virtex4/config/virtex4.cfg
index a893abe..88e50a6 100644
--- a/bsps/powerpc/virtex4/config/virtex4.cfg
+++ b/bsps/powerpc/virtex4/config/virtex4.cfg
@@ -5,7 +5,7 @@ RTEMS_CPU=powerpc
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
 #
-CPU_CFLAGS = -mcpu=405 -Dppc405
+CPU_CFLAGS = -mcpu=405
 
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions
diff --git a/c/src/lib/libbsp/powerpc/virtex4/configure.ac b/c/src/lib/libbsp/powerpc/virtex4/configure.ac
index a6c4eb5..16784e1 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/configure.ac
+++ b/c/src/lib/libbsp/powerpc/virtex4/configure.ac
@@ -33,6 +33,8 @@ RTEMS_BSPOPTS_SET([PPC_VECTOR_FILE_BASE],[*],[0x0100])
 RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE],
 [This defines the base address of the exception table.])
 
+AC_DEFINE(ppc405, 1, [PowerPC model option])
+
 RTEMS_BSP_CLEANUP_OPTIONS
 
 # Explicitly list all Makefiles here
-- 
1.8.3.1