2002-04-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* custom/dmv177.cfg: Add -D_OLD_EXCEPTIONS -Dppc603e to CPU_CFLAGS.
	Remove obsolete comments.
	* custom/eth_comm.cfg: Remove make-target-options.
	Add -Dmpc$(CPU_TYPE) -DPPC_ABI=PPC_ABI_EABI -DPPC_ASM=PPC_ASM_ELF to
	CPU_CFLAGS.
	* custom/gen405.cfg: Add -D_OLD_EXCEPTIONS -Dppc405 to CPU_CFLAGS.
	* custom/helas403.cfg: Add -D_OLD_EXCEPTIONS -Dppc403 to CPU_CFLAGS.
	* custom/mbx8xx.cfg: Remove make-target-options.
	Add -Dmpc$(CPU_TYPE) -D$(RTEMS_MBX_MODEL) to CPU_CFLAGS.
	Remove obsolete comments.
	* custom/mcp750.cfg: Add -Dmpc750 to CPU_CFLAGS.
	Remove obsolete comments.
	* custom/mpc8260ads.cfg: Remove make-target-options.
	Add -Dmpc8260 -DPPC_ABI=PPC_ABI_EABI -DPPC_ASM=PPC_ASM_ELF to
	CPU_CFLAGS.
	* custom/mvme2307.cfg: Add -Dmpc604 to CPU_CFLAGS.
	Remove obsolete comments.
	* custom/ppcn_60x.cfg: Add -D_OLD_EXCEPTIONS -Dppc603e to
	CPU_CFLAGS.
	Remove obsolete comments.
	* custom/psim.cfg: Add -D_OLD_EXCEPTIONS -Dppc603e to CPU_CFLAGS.
	Remove obsolete comments.
	* custom/score603e.cfg: Add -D_OLD_EXCEPTIONS -Dppc603e to
	CPU_CFLAGS.
	Remove obsolete comments.

12 files changed, 42 insertions, 117 deletions

diff --git a/make/ChangeLog b/make/ChangeLog
index 9c5d4bfb1f..b53e4cae03 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,31 @@
+2002-04-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* custom/dmv177.cfg: Add -D_OLD_EXCEPTIONS -Dppc603e to CPU_CFLAGS.
+	Remove obsolete comments.
+	* custom/eth_comm.cfg: Remove make-target-options.
+	Add -Dmpc$(CPU_TYPE) -DPPC_ABI=PPC_ABI_EABI -DPPC_ASM=PPC_ASM_ELF to
+	CPU_CFLAGS.
+	* custom/gen405.cfg: Add -D_OLD_EXCEPTIONS -Dppc405 to CPU_CFLAGS.
+	* custom/helas403.cfg: Add -D_OLD_EXCEPTIONS -Dppc403 to CPU_CFLAGS.
+	* custom/mbx8xx.cfg: Remove make-target-options.
+	Add -Dmpc$(CPU_TYPE) -D$(RTEMS_MBX_MODEL) to CPU_CFLAGS.
+	Remove obsolete comments.
+	* custom/mcp750.cfg: Add -Dmpc750 to CPU_CFLAGS.
+	Remove obsolete comments.
+	* custom/mpc8260ads.cfg: Remove make-target-options.
+	Add -Dmpc8260 -DPPC_ABI=PPC_ABI_EABI -DPPC_ASM=PPC_ASM_ELF to
+	CPU_CFLAGS.
+	* custom/mvme2307.cfg: Add -Dmpc604 to CPU_CFLAGS.
+	Remove obsolete comments.
+	* custom/ppcn_60x.cfg: Add -D_OLD_EXCEPTIONS -Dppc603e to
+	CPU_CFLAGS.
+	Remove obsolete comments.
+	* custom/psim.cfg: Add -D_OLD_EXCEPTIONS -Dppc603e to CPU_CFLAGS.
+	Remove obsolete comments.
+	* custom/score603e.cfg: Add -D_OLD_EXCEPTIONS -Dppc603e to
+	CPU_CFLAGS.
+	Remove obsolete comments.
+
 2002-04-04	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* custom/gen405.cfg: Remove -D__powerpc__.
diff --git a/make/custom/dmv177.cfg b/make/custom/dmv177.cfg
index 595279a8a0..e8a7a7221a 100644
--- a/make/custom/dmv177.cfg
+++ b/make/custom/dmv177.cfg
@@ -19,25 +19,13 @@ RTEMS_BSP_FAMILY=dmv177
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #
-CPU_CFLAGS = -mcpu=603
+CPU_CFLAGS = -mcpu=603 -D_OLD_EXCEPTIONS -Dppc603e
 
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
 # NOTE: some level of -O may be actually required by inline assembler
 CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
 
-# The following is a ld command file which works without using the
-# -specs system in gcc 2.8.  IT HAS NEVER BEEN TESTED WITH THIS BSP!!!
-#       $(LD) $(XLDFLAGS) -T $(LINKCMDS) \
-#         -o $@ -u atexit -u __vectors -u download_entry $(LINK_FILES)
-#       $(LD) $(XLDFLAGS) -Ttext 0x20000 \
-#         -o $@ -u atexit -u __vectors -u download_entry $(LINK_FILES)
-
-#       $(CC) -mmvme -mrtems -nostartfiles -mcpu=603 \
-#           -o $(basename $@).exe -L $(PROJECT_RELEASE)/lib \
-#            $(START_FILE) $(LINK_OBJS) \
-#            $(LD_LIBS) \
-#           -Wl,-\( -Wl,-lc -Wl,-lrtemsall -Wl,-lgcc -Wl,-\)
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
 	    -o $(basename $@).nxe $(LINK_OBJS) $(LINK_LIBS)
diff --git a/make/custom/eth_comm.cfg b/make/custom/eth_comm.cfg
index f9bc608dd1..2cef71c88a 100644
--- a/make/custom/eth_comm.cfg
+++ b/make/custom/eth_comm.cfg
@@ -14,8 +14,6 @@ CPU_TYPE=860
 RTEMS_BSP_FAMILY=eth_comm
 RTEMS_PPC_EXCEPTION_PROCESSING_MODEL=new
 
-#  This section makes the target dependent options file.
-
 #  PPC_ABI (PowerPC)
 #     This defines the calling convention (Application Binary Interface)
 #     used in this configuration.  EABI is the only one supported.
@@ -26,20 +24,11 @@ RTEMS_PPC_EXCEPTION_PROCESSING_MODEL=new
 #     ELF is the only one supported.
 #
 
-define make-target-options
-	@echo "#ifdef mpc$(CPU_TYPE)"                       >>$@
-	@echo "#undef mpc$(CPU_TYPE)"                       >>$@
-	@echo "#endif"                                      >>$@
-	@echo "#define mpc$(CPU_TYPE) 1"                    >>$@
-	@echo                                               >>$@
-	@echo "#define PPC_ABI PPC_ABI_EABI"                >>$@
-	@echo "#define PPC_ASM PPC_ASM_ELF"                 >>$@
-endef
-
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #
-CPU_CFLAGS = -mcpu=$(CPU_TYPE)
+CPU_CFLAGS = -mcpu=$(CPU_TYPE) -Dmpc$(CPU_TYPE) \
+  -DPPC_ABI=PPC_ABI_EABI -DPPC_ASM=PPC_ASM_ELF
 
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
diff --git a/make/custom/gen405.cfg b/make/custom/gen405.cfg
index 86020a49ca..1bc9628010 100644
--- a/make/custom/gen405.cfg
+++ b/make/custom/gen405.cfg
@@ -22,7 +22,7 @@ RTEMS_BSP_FAMILY=gen405
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #
-CPU_CFLAGS = -mcpu=403
+CPU_CFLAGS = -mcpu=403 -D_OLD_EXCEPTIONS -Dppc405
 
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
diff --git a/make/custom/helas403.cfg b/make/custom/helas403.cfg
index 5883df2254..74d752ff88 100644
--- a/make/custom/helas403.cfg
+++ b/make/custom/helas403.cfg
@@ -16,7 +16,7 @@ RTEMS_BSP_FAMILY=helas403
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #
-CPU_CFLAGS = -mcpu=403
+CPU_CFLAGS = -mcpu=403 -D_OLD_EXCEPTIONS -Dppc403
 
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
diff --git a/make/custom/mbx8xx.cfg b/make/custom/mbx8xx.cfg
index 33b82d206b..559ceacfc9 100644
--- a/make/custom/mbx8xx.cfg
+++ b/make/custom/mbx8xx.cfg
@@ -65,18 +65,10 @@ endif # mbx821
 #  MBX8xx-specific options:
 #
 
-define make-target-options
-	@echo "#ifdef mpc$(CPU_TYPE)"                       >>$@
-	@echo "#undef mpc$(CPU_TYPE)"                       >>$@
-	@echo "#endif"                                      >>$@
-	@echo "#define mpc$(CPU_TYPE) 1"                    >>$@
-	@echo                                               >>$@
-endef
-
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
 #
-CPU_CFLAGS = -mcpu=$(CPU_TYPE)
+CPU_CFLAGS = -mcpu=$(CPU_TYPE) -Dmpc$(CPU_TYPE) -D$(RTEMS_MBX_MODEL)
 
 CFLAGS_DEBUG_V += -ggdb
 CXXFLAGS_DEBUG_V += -ggdb
@@ -88,10 +80,6 @@ CXXFLAGS_DEBUG_V += -ggdb
 CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
 CXXFLAGS_OPTIMIZE_V=-O4
 
-# The following are definitions of make-exe which will work using ld as
-# is currently required.  It is expected that as of gcc 2.8, the end user
-# will be able to override parts of the compilers specs and link using gcc.
-
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) $(MBX8xx_LDFLAGS) \
 	    -o $(basename $@)_sym.exe $(LINK_OBJS) $(LINK_LIBS)
diff --git a/make/custom/mcp750.cfg b/make/custom/mcp750.cfg
index bb574a36d5..ef1c077faa 100644
--- a/make/custom/mcp750.cfg
+++ b/make/custom/mcp750.cfg
@@ -19,7 +19,7 @@ RTEMS_BSP_FAMILY=motorola_powerpc
 # NOTE : cheking egcc 1.1.1 source code shows that the last know processor 
 # is the 604 model and that this is the default generation option.
 #
-CPU_CFLAGS = -mcpu=750
+CPU_CFLAGS = -mcpu=750 -Dmpc750
 
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
@@ -36,18 +36,6 @@ CFLAGS_OPTIMIZE_V=-O4 -mmultiple -mstring -mstrict-align
 # BSP using inlined code
 CFLAGS_DEBUG_V = -O1 -mmultiple -mstring -mstrict-align
 
-# The following is a ld command file which works without using the
-# -specs system in gcc 2.8.  IT HAS NEVER BEEN TESTED WITH THIS BSP!!!
-#       $(LD) $(XLDFLAGS) -T $(LINKCMDS) \
-#         -o $@ -u atexit -u __vectors -u download_entry $(LINK_FILES)
-#       $(LD) $(XLDFLAGS) -Ttext 0x20000 \
-#         -o $@ -u atexit -u __vectors -u download_entry $(LINK_FILES)
-
-#       $(CC) -mmvme -mrtems -nostartfiles -mcpu=603 \
-#           -o $(basename $@).exe -L $(PROJECT_RELEASE)/lib \
-#            $(START_FILE) $(LINK_OBJS) \
-#            $(LD_LIBS) \
-#           -Wl,-\( -Wl,-lc -Wl,-lrtemsall -Wl,-lgcc -Wl,-\)
 define make-exe
   	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
 	   -o $(basename $@).nxe $(LINK_OBJS) $(LINK_LIBS)
diff --git a/make/custom/mpc8260ads.cfg b/make/custom/mpc8260ads.cfg
index f0249d866f..b302b53f8f 100644
--- a/make/custom/mpc8260ads.cfg
+++ b/make/custom/mpc8260ads.cfg
@@ -13,8 +13,6 @@ CPU_TYPE=8260
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=mpc8260ads
 
-#  This section makes the target dependent options file.
-
 #  PPC_ABI (PowerPC)
 #     This defines the calling convention (Application Binary Interface)
 #     used in this configuration.  EABI is the only one supported.
@@ -24,20 +22,12 @@ RTEMS_BSP_FAMILY=mpc8260ads
 #     This defines the assembly language format used in this configuration.
 #     ELF is the only one supported.
 
-define make-target-options
-	@echo "#ifdef mpc$(CPU_TYPE)"                       >>$@
-	@echo "#undef mpc$(CPU_TYPE)"                       >>$@
-	@echo "#endif"                                      >>$@
-	@echo "#define mpc$(CPU_TYPE) 1"                    >>$@
-	@echo                                               >>$@
-	@echo "#define PPC_ABI PPC_ABI_EABI"                >>$@
-	@echo "#define PPC_ASM PPC_ASM_ELF"                 >>$@
-endef
-
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #
-CPU_CFLAGS = -mcpu=$(CPU_TYPE) -mstrict-align
+# CPU_CFLAGS = -mcpu=$(CPU_TYPE) -mstrict-align
+CPU_CFLAGS = -mcpu=603e -mstrict-align -Dmpc8260 \
+  -DPPC_ABI=PPC_ABI_EABI -DPPC_ASM=PPC_ASM_ELF
 
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
@@ -56,5 +46,3 @@ define make-exe
 endef
 
 # Miscellaneous additions go here
-
-
diff --git a/make/custom/mvme2307.cfg b/make/custom/mvme2307.cfg
index cf9c549dd9..775a3e181c 100644
--- a/make/custom/mvme2307.cfg
+++ b/make/custom/mvme2307.cfg
@@ -16,7 +16,7 @@ RTEMS_BSP_FAMILY=motorola_powerpc
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #
-CPU_CFLAGS = -mcpu=604 -mmultiple -mstring -mstrict-align
+CPU_CFLAGS = -mcpu=604 -mmultiple -mstring -mstrict-align -Dmpc604
 
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
@@ -32,18 +32,6 @@ CFLAGS_DEBUG_V = -O1
 # BSP using inlined code
 CFLAGS_PROFILE_V = -O1   
 
-# The following is a linkcmds file which will work without using the
-# -specs system in gcc 2.8.
-#       $(LD) $(XLDFLAGS) -T $(LINKCMDS) \
-#         -o $@ -u atexit -u __vectors -u download_entry $(LINK_FILES)
-#       $(LD) $(XLDFLAGS) -Ttext 0x20000 \
-#         -o $@ -u atexit -u __vectors -u download_entry $(LINK_FILES)
-
-#       $(CC) -mmvme -mrtems -nostartfiles -mcpu=603 \
-#           -o $(basename $@).exe -L $(PROJECT_RELEASE)/lib \
-#            $(START_FILE) $(LINK_OBJS) \
-#            $(LD_LIBS) \
-#           -Wl,-\( -Wl,-lc -Wl,-lrtemsall -Wl,-lgcc -Wl,-\)
 define make-exe
   	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
 	   -o $(basename $@).nxe $(LINK_OBJS) $(LINK_LIBS)
diff --git a/make/custom/ppcn_60x.cfg b/make/custom/ppcn_60x.cfg
index b6bca171d0..828401f462 100644
--- a/make/custom/ppcn_60x.cfg
+++ b/make/custom/ppcn_60x.cfg
@@ -16,7 +16,7 @@ RTEMS_BSP_FAMILY=ppcn_60x
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #
-CPU_CFLAGS = -mcpu=603
+CPU_CFLAGS = -mcpu=603 -D_OLD_EXCEPTIONS -Dppc603e
 
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
@@ -24,18 +24,6 @@ CPU_CFLAGS = -mcpu=603
 CFLAGS_OPTIMIZE_V=-O0 -fno-keep-inline-functions -fvolatile-global -fvolatile
 #CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions -fvolatile-global -fvolatile
 
-# The following is a linkcmds file which will work without using the
-# -specs system in gcc 2.8.
-#       $(LD) $(XLDFLAGS) -T $(LINKCMDS) \
-#         -o $@ -u atexit -u __vectors -u download_entry $(LINK_FILES)
-#       $(LD) $(XLDFLAGS) -Ttext 0x20000 \
-#         -o $@ -u atexit -u __vectors -u download_entry $(LINK_FILES)
-
-#       $(CC) -mmvme -mrtems -nostartfiles -mcpu=603 \
-#           -o $(basename $@).exe -L $(PROJECT_RELEASE)/lib \
-#            $(START_FILE) $(LINK_OBJS) \
-#            $(LD_LIBS) \
-#           -Wl,-\( -Wl,-lc -Wl,-lrtemsall -Wl,-lgcc -Wl,-\)
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
 	    -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS)
diff --git a/make/custom/psim.cfg b/make/custom/psim.cfg
index 29dd21717c..b6b06d4815 100644
--- a/make/custom/psim.cfg
+++ b/make/custom/psim.cfg
@@ -15,7 +15,7 @@ RTEMS_BSP_FAMILY=psim
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #
-CPU_CFLAGS = -mcpu=603 
+CPU_CFLAGS = -mcpu=603 -D_OLD_EXCEPTIONS -Dppc603e
 #-ffunction-sections
 
 # optimize flag: typically -0, could use -O4 or -fast
@@ -23,19 +23,6 @@ CPU_CFLAGS = -mcpu=603
 # NOTE: some level of -O may be actually required by inline assembler
 CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
 
-# The following is a linkcmds file which will work without using the
-# -specs system in gcc 2.8.
-#       $(LD) $(XLDFLAGS) -T $(LINKCMDS) \
-#         -o $@ -u atexit -u __vectors -u download_entry $(LINK_FILES)
-#       $(LD) $(XLDFLAGS) -Ttext 0x20000 \
-#         -o $@ -u atexit -u __vectors -u download_entry $(LINK_FILES)
-
-#       $(CC) -mmvme -mrtems -nostartfiles -mcpu=603 \
-#           -o $(basename $@).exe -L $(PROJECT_RELEASE)/lib \
-#            $(START_FILE) $(LINK_OBJS) \
-#            $(LD_LIBS) \
-#           -Wl,-\( -Wl,-lc -Wl,-lrtemsall -Wl,-lgcc -Wl,-\)
-# -Wl,--gc-sections
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).exe \
 	    $(LINK_OBJS) $(LINK_LIBS)
diff --git a/make/custom/score603e.cfg b/make/custom/score603e.cfg
index 6dba71d30e..249076286f 100644
--- a/make/custom/score603e.cfg
+++ b/make/custom/score603e.cfg
@@ -20,7 +20,7 @@ RTEMS_BSP_FAMILY=score603e
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #
-CPU_CFLAGS = -mcpu=603
+CPU_CFLAGS = -mcpu=603 -D_OLD_EXCEPTIONS -Dppc603e
 
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
@@ -28,13 +28,6 @@ CPU_CFLAGS = -mcpu=603
 CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
 # CFLAGS_OPTIMIZE_V=-O0 
 
-# The following is a linkcmds file which will work without using the
-# -specs system in gcc 2.8.
-#       $(LD) $(XLDFLAGS) -T $(LINKCMDS) \
-#         -o $@ -u atexit -u __vectors -u download_entry $(LINK_FILES)
-#       $(LD) $(XLDFLAGS) -Ttext 0x20000 \
-#         -o $@ -u atexit -u __vectors -u download_entry $(LINK_FILES)
-
 define make-exe
 	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
 	    -o $(basename $@).elf $(LINK_OBJS) $(LINK_LIBS)