[PATCH 03/16] motorola_powerpc: Move -Dxxx to configure.ac

[Joel Sherrill]

Updates #3425.
---
 bsps/powerpc/motorola_powerpc/config/mcp750.cfg           |  2 +-
 bsps/powerpc/motorola_powerpc/config/mtx603e.cfg          |  2 +-
 bsps/powerpc/motorola_powerpc/config/mvme2100.cfg         |  2 +-
 bsps/powerpc/motorola_powerpc/config/qemuprep-altivec.cfg |  4 ++--
 bsps/powerpc/motorola_powerpc/config/qemuprep.cfg         |  4 ++--
 c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac    | 14 ++++++++++++++
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/bsps/powerpc/motorola_powerpc/config/mcp750.cfg b/bsps/powerpc/motorola_powerpc/config/mcp750.cfg
index 691a76a..24abc47 100644
--- a/bsps/powerpc/motorola_powerpc/config/mcp750.cfg
+++ b/bsps/powerpc/motorola_powerpc/config/mcp750.cfg
@@ -9,7 +9,7 @@ RTEMS_CPU=powerpc
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
 #
-CPU_CFLAGS = -mcpu=750 -Dmpc750
+CPU_CFLAGS = -mcpu=750
 
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g -mmultiple -mstring -mstrict-align
diff --git a/bsps/powerpc/motorola_powerpc/config/mtx603e.cfg b/bsps/powerpc/motorola_powerpc/config/mtx603e.cfg
index dd889b8..cc0d4f4 100644
--- a/bsps/powerpc/motorola_powerpc/config/mtx603e.cfg
+++ b/bsps/powerpc/motorola_powerpc/config/mtx603e.cfg
@@ -8,7 +8,7 @@ RTEMS_CPU=powerpc
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
-CPU_CFLAGS = -mcpu=603e -Dppc603e
+CPU_CFLAGS = -mcpu=603e
 
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g -mmultiple -mstring -mstrict-align
diff --git a/bsps/powerpc/motorola_powerpc/config/mvme2100.cfg b/bsps/powerpc/motorola_powerpc/config/mvme2100.cfg
index e358c2d..2361df1 100644
--- a/bsps/powerpc/motorola_powerpc/config/mvme2100.cfg
+++ b/bsps/powerpc/motorola_powerpc/config/mvme2100.cfg
@@ -8,7 +8,7 @@ RTEMS_CPU=powerpc
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
-CPU_CFLAGS = -mcpu=603e -Dppc603e
+CPU_CFLAGS = -mcpu=603e
 
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g -mmultiple -mstring -mstrict-align
diff --git a/bsps/powerpc/motorola_powerpc/config/qemuprep-altivec.cfg b/bsps/powerpc/motorola_powerpc/config/qemuprep-altivec.cfg
index 9d09089..ed9cfa5 100644
--- a/bsps/powerpc/motorola_powerpc/config/qemuprep-altivec.cfg
+++ b/bsps/powerpc/motorola_powerpc/config/qemuprep-altivec.cfg
@@ -1,5 +1,5 @@
 #
-#  Config file for the PowerPC 604 based mvme2307
+#  Config file for the QemuPrep w/Altivec
 #
 
 include $(RTEMS_ROOT)/make/custom/default.cfg
@@ -9,7 +9,7 @@ RTEMS_CPU=powerpc
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
 #
-CPU_CFLAGS = -mcpu=7400 -mmultiple -mstring -mstrict-align -D__ppc_generic
+CPU_CFLAGS = -mcpu=7400 -mmultiple -mstring -mstrict-align
 
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g
diff --git a/bsps/powerpc/motorola_powerpc/config/qemuprep.cfg b/bsps/powerpc/motorola_powerpc/config/qemuprep.cfg
index fa5abd6..4ff7bd0 100644
--- a/bsps/powerpc/motorola_powerpc/config/qemuprep.cfg
+++ b/bsps/powerpc/motorola_powerpc/config/qemuprep.cfg
@@ -1,5 +1,5 @@
 #
-#  Config file for the PowerPC 604 based mvme2307
+#  Config file for the QemuPrep w/o Altivec
 #
 
 include $(RTEMS_ROOT)/make/custom/default.cfg
@@ -9,7 +9,7 @@ RTEMS_CPU=powerpc
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
 #
-CPU_CFLAGS = -mcpu=powerpc -mmultiple -mstring -mstrict-align -D__ppc_generic
+CPU_CFLAGS = -mcpu=powerpc -mmultiple -mstring -mstrict-align
 
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
index 238c34e..8b79309 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
@@ -47,6 +47,20 @@ RTEMS_BSPOPTS_SET([qemu],[qemuprep*],[1])
 RTEMS_BSPOPTS_SET([qemu],[*],[])
 RTEMS_BSPOPTS_HELP([qemu],[Defined for QEMU BSP -- undefined for others])
 
+RTEMS_BSPOPTS_SET([mpc750],[mcp750],[1])
+RTEMS_BSPOPTS_SET([mpc750],[*],[])
+RTEMS_BSPOPTS_HELP([mpc750],[Define when mpc750 -- undefined for others])
+
+RTEMS_BSPOPTS_SET([mpc603e],[mtx603e],[1])
+RTEMS_BSPOPTS_SET([mpc603e],[mvme2100],[1])
+RTEMS_BSPOPTS_SET([mpc603e],[*],[])
+RTEMS_BSPOPTS_HELP([mpc603e],[Define when ppc603e -- undefined for others])
+
+RTEMS_BSPOPTS_SET([__ppc_generic],[qemuprep],[1])
+RTEMS_BSPOPTS_SET([__ppc_generic],[qemuprep-altivec],[1])
+RTEMS_BSPOPTS_SET([__ppc_generic],[*],[])
+RTEMS_BSPOPTS_HELP([__ppc_generic],[Define when generic PPC -- undefined for others])
+
 RTEMS_BSP_CLEANUP_OPTIONS
 
 # Explicitly list all Makefiles here
-- 
1.8.3.1