Removed definition of PPC_ABI and PPC_ASM as there are now defaults

that reflect the GNU toolset.

9 files changed, 1 insertions, 92 deletions

diff --git a/make/custom/dmv177.cfg b/make/custom/dmv177.cfg
index a0600ab5b0..a9ef4be769 100644
--- a/make/custom/dmv177.cfg
+++ b/make/custom/dmv177.cfg
@@ -38,14 +38,6 @@ RTEMS_BSP_FAMILY=dmv177
 #     This defines the base address of the exception table.
 #     NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100
 #
-#  PPC_ABI (ppc)
-#     This defines the calling convention (Application Binary Interface)
-#     used in this configuration.  EABI is the only one supported.
-#
-#  PPC_ASM (ppc)
-#     This defines the assembly language format used in this configuration.
-#     ELF is the only one supported.
-#
 #  PPC_USE_SPRG (RTEMS PowerPC port)
 #     If defined, then the PowerPC specific code in RTEMS will use some
 #     of the special purpose registers to slightly optimize interrupt
@@ -73,8 +65,6 @@ define make-target-options
 	@echo "#define CONSOLE_USE_INTERRUPTS 0"                   >>$@
 	@echo "#define CONSOLE_USE_POLLED !CONSOLE_USE_INTERRUPTS" >>$@
 	@echo "#define PPC_VECTOR_FILE_BASE 0x0100"                >>$@
-	@echo "#define PPC_ABI PPC_ABI_EABI"                       >>$@
-	@echo "#define PPC_ASM PPC_ASM_ELF"                        >>$@
 	@echo "#define PPC_USE_SPRG 0"                             >>$@
 	@echo "#define PPC_USE_DATA_CACHE 0"                       >>$@
 	@echo "#define PPC_USE_INSTRUCTION_CACHE 1"                >>$@
diff --git a/make/custom/eth_comm.cfg b/make/custom/eth_comm.cfg
index 9f44eb4e91..cde4b4ee30 100644
--- a/make/custom/eth_comm.cfg
+++ b/make/custom/eth_comm.cfg
@@ -12,8 +12,7 @@ RTEMS_CPU_MODEL=mpc860
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=eth_comm
 
-CPU_DEFINES=-DPPC_ABI=PPC_ABI_EABI \
-   -DPPC_ASM=PPC_ASM_ELF -DPPC_VECTOR_FILE_BASE=0x00000000
+CPU_DEFINES=-DPPC_VECTOR_FILE_BASE=0x00000000
 
 #  This section makes the target dependent options file.
 
diff --git a/make/custom/helas403.cfg b/make/custom/helas403.cfg
index 974d3e79c5..b9e49b33ba 100644
--- a/make/custom/helas403.cfg
+++ b/make/custom/helas403.cfg
@@ -18,10 +18,6 @@ RTEMS_CPU_MODEL=ppc403
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=helas403
 
-#  These should be defined in targopt.h now.
-#CPU_DEFINES=-DPPC_ABI=PPC_ABI_POWEROPEN \
-#   -DPPC_ASM=PPC_ASM_ELF -DPPC_VECTOR_FILE_BASE=0x0100
-
 #  This section makes the target dependent options file.
 
 #  NDEBUG (C library)
@@ -39,15 +35,6 @@ RTEMS_BSP_FAMILY=helas403
 #     This defines the base address of the exception table.
 #     NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100
 #       
-#  PPC_ABI (PowerPC)
-#     This defines the calling convention (Application Binary Interface)
-#     used in this configuration.  EABI is the only one supported.
-#     This BSP was initially developed using the PowerOpen ABI.
-#
-#  PPC_ASM (PowerPC)
-#     This defines the assembly language format used in this configuration.
-#     ELF is the only one supported.
-#
 #  PPC_USE_SPRG (RTEMS PowerPC port)
 #     If defined, then the PowerPC specific code in RTEMS will use some
 #     of the special purpose registers to slightly optimize interrupt
@@ -59,8 +46,6 @@ define make-target-options
 	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 	@echo "/* #define RTEMS_DEBUG  1 */"                >>$@
 	@echo "#define PPC_VECTOR_FILE_BASE 0x0100"         >>$@
-	@echo "#define PPC_ABI PPC_ABI_EABI"                >>$@
-	@echo "#define PPC_ASM PPC_ASM_ELF"                 >>$@
 	@echo "#define PPC_USE_SPRG 1"                      >>$@
 endef
 
diff --git a/make/custom/mcp750.cfg b/make/custom/mcp750.cfg
index ddacd5549a..19f2d973e1 100644
--- a/make/custom/mcp750.cfg
+++ b/make/custom/mcp750.cfg
@@ -29,14 +29,6 @@ RTEMS_BSP_FAMILY=motorola_powerpc
 #     This defines the base address of the exception table.
 #     NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100
 #
-#  PPC_ABI (ppc)
-#     This defines the calling convention (Application Binary Interface)
-#     used in this configuration.  EABI is the only one supported.
-#
-#  PPC_ASM (ppc)
-#     This defines the assembly language format used in this configuration.
-#     ELF is the only one supported.
-#
 #  PPC_USE_SPRG (RTEMS PowerPC port)
 #     If defined, then the PowerPC specific code in RTEMS will use some
 #     of the special purpose registers to slightly optimize interrupt
@@ -57,8 +49,6 @@ define make-target-options
 	@echo "#define PPCN_60X_USE_NONE 1"                   >>$@
 	@echo "#define PPC_USE_DATA_CACHE 1"                   >>$@
 	@echo "#define PPC_VECTOR_FILE_BASE 0x0100"            >>$@
-	@echo "#define PPC_ABI PPC_ABI_EABI"                   >>$@
-	@echo "#define PPC_ASM PPC_ASM_ELF"                    >>$@
 	@echo "#define PPC_USE_SPRG  1"                        >>$@
 endef
 
diff --git a/make/custom/mvme2307.cfg b/make/custom/mvme2307.cfg
index bac65d2d48..d4a628956a 100644
--- a/make/custom/mvme2307.cfg
+++ b/make/custom/mvme2307.cfg
@@ -35,14 +35,6 @@ RTEMS_BSP_FAMILY=motorola_powerpc
 #     This defines the base address of the exception table.
 #     NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100
 #
-#  PPC_ABI (PowerPC)
-#     This defines the calling convention (Application Binary Interface)
-#     used in this configuration.  EABI is the only one supported.
-#
-#  PPC_ASM (PowerPC)
-#     This defines the assembly language format used in this configuration.
-#     ELF is the only one supported.
-#
 #  PPC_USE_SPRG (RTEMS PowerPC port)
 #     If defined, then the PowerPC specific code in RTEMS will use some
 #     of the special purpose registers to slightly optimize interrupt
@@ -58,8 +50,6 @@ define make-target-options
 	@echo "#define PPCN_60X_USE_NONE 1"                   >>$@
 	@echo "#define PPC_USE_DATA_CACHE 1"                   >>$@
 	@echo "#define PPC_VECTOR_FILE_BASE 0x0100"            >>$@
-	@echo "#define PPC_ABI PPC_ABI_EABI"                   >>$@
-	@echo "#define PPC_ASM PPC_ASM_ELF"                    >>$@
 	@echo "#define PPC_USE_SPRG  1"
 endef
 
diff --git a/make/custom/papyrus.cfg b/make/custom/papyrus.cfg
index e1637b4b96..842b4a9bf3 100644
--- a/make/custom/papyrus.cfg
+++ b/make/custom/papyrus.cfg
@@ -12,10 +12,6 @@ RTEMS_CPU_MODEL=ppc403
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=papyrus
 
-#  These should be defined in targopt.h now.
-#CPU_DEFINES=-DPPC_ABI=PPC_ABI_POWEROPEN \
-#   -DPPC_ASM=PPC_ASM_ELF -DPPC_VECTOR_FILE_BASE=0x0100
-
 #  This section makes the target dependent options file.
 
 #  NDEBUG (C library)
@@ -33,15 +29,6 @@ RTEMS_BSP_FAMILY=papyrus
 #     This defines the base address of the exception table.
 #     NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100
 #       
-#  PPC_ABI (PowerPC)
-#     This defines the calling convention (Application Binary Interface)
-#     used in this configuration.  EABI is the only one supported.
-#     This BSP was initially developed using the PowerOpen ABI.
-#
-#  PPC_ASM (PowerPC)
-#     This defines the assembly language format used in this configuration.
-#     ELF is the only one supported.
-#
 #  PPC_USE_SPRG (RTEMS PowerPC port)
 #     If defined, then the PowerPC specific code in RTEMS will use some
 #     of the special purpose registers to slightly optimize interrupt
@@ -53,8 +40,6 @@ define make-target-options
 	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 	@echo "/* #define RTEMS_DEBUG  1 */"                >>$@
 	@echo "#define PPC_VECTOR_FILE_BASE 0x0100"         >>$@
-	@echo "#define PPC_ABI PPC_ABI_EABI"                >>$@
-	@echo "#define PPC_ASM PPC_ASM_ELF"                 >>$@
 	@echo "#define PPC_USE_SPRG 1"                      >>$@
 endef
 
diff --git a/make/custom/ppcn_60x.cfg b/make/custom/ppcn_60x.cfg
index 89d8402400..9c8468e443 100644
--- a/make/custom/ppcn_60x.cfg
+++ b/make/custom/ppcn_60x.cfg
@@ -36,14 +36,6 @@ RTEMS_BSP_FAMILY=ppcn_60x
 #     This defines the base address of the exception table.
 #     NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100
 #
-#  PPC_ABI (ppc)
-#     This defines the calling convention (Application Binary Interface)
-#     used in this configuration.  EABI is the only one supported.
-#
-#  PPC_ASM (ppc)
-#     This defines the assembly language format used in this configuration.
-#     ELF is the only one supported.
-#
 #  PPC_USE_SPRG (RTEMS PowerPC port)
 #     If defined, then the PowerPC specific code in RTEMS will use some
 #     of the special purpose registers to slightly optimize interrupt
@@ -64,8 +56,6 @@ define make-target-options
 	@echo "#define PPCN_60X_USE_NONE 0"                   >>$@
 	@echo "#define PPC_USE_DATA_CACHE 1"                   >>$@
 	@echo "#define PPC_VECTOR_FILE_BASE 0x0100"            >>$@
-	@echo "#define PPC_ABI PPC_ABI_EABI"                   >>$@
-	@echo "#define PPC_ASM PPC_ASM_ELF"                    >>$@
 	@echo "#define PPC_USE_SPRG  0"                        >>$@
 endef
 
diff --git a/make/custom/psim.cfg b/make/custom/psim.cfg
index 3ec564d0ea..62e3074993 100644
--- a/make/custom/psim.cfg
+++ b/make/custom/psim.cfg
@@ -39,14 +39,6 @@ RTEMS_BSP_FAMILY=psim
 #     This defines the base address of the exception table.
 #     NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100
 #
-#  PPC_ABI (PowerPC)
-#     This defines the calling convention (Application Binary Interface)
-#     used in this configuration.  EABI is the only one supported.
-#
-#  PPC_ASM (PowerPC)
-#     This defines the assembly language format used in this configuration.
-#     ELF is the only one supported.
-#
 #  PPC_USE_SPRG (RTEMS PowerPC port)
 #     If defined, then the PowerPC specific code in RTEMS will use some
 #     of the special purpose registers to slightly optimize interrupt
@@ -63,8 +55,6 @@ define make-target-options
 	@echo "#define CONSOLE_USE_POLLED !CONSOLE_USE_INTERRUPTS" >>$@
 	@echo "#define PSIM_FAST_IDLE 1"                           >>$@
 	@echo "#define PPC_VECTOR_FILE_BASE 0xFFF00100"            >>$@
-	@echo "#define PPC_ABI PPC_ABI_EABI"                       >>$@
-	@echo "#define PPC_ASM PPC_ASM_ELF"                        >>$@
 	@echo "#define PPC_USE_SPRG 1"                             >>$@
 endef
 
diff --git a/make/custom/score603e.cfg b/make/custom/score603e.cfg
index bf5ce6faad..67e9534ea5 100644
--- a/make/custom/score603e.cfg
+++ b/make/custom/score603e.cfg
@@ -61,14 +61,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
 #     This defines the base address of the exception table.
 #     NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100
 #
-#  PPC_ABI (ppc)
-#     This defines the calling convention (Application Binary Interface)
-#     used in this configuration.  EABI is the only one supported.
-#
-#  PPC_ASM (ppc)
-#     This defines the assembly language format used in this configuration.
-#     ELF is the only one supported.
-#
 #  PPC_USE_SPRG (RTEMS PowerPC port)
 #     If defined, then the PowerPC specific code in RTEMS will use some
 #     of the special purpose registers to slightly optimize interrupt
@@ -94,8 +86,6 @@ define make-target-options
 	@echo "#define SCORE603E_USE_OPEN_FIRMWARE 0"                >>$@
 	@echo "#define PPC_USE_DATA_CACHE 0"                         >>$@
 	@echo "#define PPC_VECTOR_FILE_BASE 0x0100"                  >>$@
-	@echo "#define PPC_ABI PPC_ABI_EABI"                         >>$@
-	@echo "#define PPC_ASM PPC_ASM_ELF"                          >>$@
 	@echo "#define PPC_USE_SPRG  0"                              >>$@
 	@echo "#define HAS_PMC_PSC8  0"                              >>$@
 endef