[PATCH 04/16] mpc55xxevb: Move -Dxxx to configure.ac

[Joel Sherrill]

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

diff --git a/bsps/powerpc/mpc55xxevb/config/mpc55xx.inc b/bsps/powerpc/mpc55xxevb/config/mpc55xx.inc
index 5b0b843..56c5801 100644
--- a/bsps/powerpc/mpc55xxevb/config/mpc55xx.inc
+++ b/bsps/powerpc/mpc55xxevb/config/mpc55xx.inc
@@ -15,7 +15,7 @@ CPU_CFLAGS_FLOAT ?= -msoft-float -mno-spe
 
 # FIXME
 CPU_CFLAGS = -mcpu=8540 -meabi -msdata=sysv -fno-common $(CPU_CFLAGS_FLOAT) \
-    -D__ppc_generic -mstrict-align
+    -mstrict-align
 
 CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions
 CFLAGS_OPTIMIZE_V += -ffunction-sections -fdata-sections
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
index fd26285..809fcd1 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
@@ -214,6 +214,8 @@ RTEMS_BSPOPTS_HELP([MPC55XX_NEEDS_LOW_LEVEL_INIT],[if defined, do low level init
 RTEMS_BSPOPTS_SET([MPC55XX_ENABLE_START_PROLOGUE],[mpc5674f_rsm6],[1])
 RTEMS_BSPOPTS_HELP([MPC55XX_ENABLE_START_PROLOGUE],[if defined, enable start prologue])
 
+AC_DEFINE(__ppc_generic, 1, [PowerPC model option])
+
 AC_CONFIG_FILES([Makefile])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-- 
1.8.3.1