* config.gcc (m68020-*-elf*, m68k-*-elf*, m68010-*-netbsdelf*,

	m68k*-*-netbsdelf*, m68k-*-rtems*): Add tm_defines containing
	MOTOROLA and USE_GAS.
	* config/m68k/rtemself.h (MOTOROLA): Delete.
	* config/m68k/netbsd-elf.h (MOTOROLA, USE_GAS): Delete.
	* config/m68k/m68kelf.h (MOTOROLA, USE_GAS, SGS_CMP_ORDER): Delete.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74048 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 12 insertions, 14 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b27b826138e..04a28287198 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-28  Gunther Nikl  <gni@gecko.de>
+
+	* config.gcc (m68020-*-elf*, m68k-*-elf*, m68010-*-netbsdelf*,
+	m68k*-*-netbsdelf*, m68k-*-rtems*): Add tm_defines containing
+	MOTOROLA and USE_GAS.
+	* config/m68k/rtemself.h (MOTOROLA): Delete.
+	* config/m68k/netbsd-elf.h (MOTOROLA, USE_GAS): Delete.
+	* config/m68k/m68kelf.h (MOTOROLA, USE_GAS, SGS_CMP_ORDER): Delete.
+
 2003-11-29  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* config/h8300/h8300.h (WORDS_BIG_ENDIAN): Update the comment.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index ae9447db90e..4cf62a815ff 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1324,12 +1324,14 @@ m68k-*-coff*)
 	;;
 m68020-*-elf* | m68k-*-elf*)
 	tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h"
+	tm_defines="MOTOROLA USE_GAS"
 	tmake_file=m68k/t-m68kelf
 	extra_parts="crtbegin.o crtend.o"
 	use_fixproto=yes
 	;;
 m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
 	tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h"
+	tm_defines="MOTOROLA USE_GAS"
 	case ${target} in
 	m68010*)
 		target_cpu_default="0"
@@ -1376,6 +1378,7 @@ m68k-*-linux*)		# Motorola m68k's running GNU/Linux
 m68k-*-rtems*)
 	tmake_file="m68k/t-m68kbare m68k/t-crtstuff t-rtems m68k/t-rtems"
 	tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h m68k/rtemself.h rtems.h"
+	tm_defines="MOTOROLA USE_GAS"
 	extra_parts="crtbegin.o crtend.o"
 	;;
 mcore-*-elf)
diff --git a/gcc/config/m68k/m68kelf.h b/gcc/config/m68k/m68kelf.h
index 6aebf3840e8..dfccef66c02 100644
--- a/gcc/config/m68k/m68kelf.h
+++ b/gcc/config/m68k/m68kelf.h
@@ -22,13 +22,6 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* These are necessary for -fpic/-fPIC to work correctly.  */
-#ifndef MOTOROLA
-#define MOTOROLA                /* Use MOTOROLA syntax.  */
-#endif
-#ifndef  USE_GAS  /* forces jsbr instead of jsr.  */
-#define  USE_GAS
-#endif
 
 #ifndef SWBEG_ASM_OP
 #define SWBEG_ASM_OP "\t.swbeg\t"
@@ -246,8 +239,6 @@ extern int switch_table_difference_label_flag;
   fprintf ((FILE), "%s&%d\n", SWBEG_ASM_OP, XVECLEN (PATTERN (TABLE), 1));
 /* end of stuff from m68kv4.h */
 
-#undef SGS_CMP_ORDER
-
 #undef ENDFILE_SPEC
 #define ENDFILE_SPEC "crtend.o%s"
 
diff --git a/gcc/config/m68k/netbsd-elf.h b/gcc/config/m68k/netbsd-elf.h
index 79569e3e65a..bbc8bdb20c8 100644
--- a/gcc/config/m68k/netbsd-elf.h
+++ b/gcc/config/m68k/netbsd-elf.h
@@ -143,9 +143,6 @@ while (0)
    Here is a bunch of stuff lifted from m68kelf.h.  We don't use that
    file directly, because it has a lot of baggage we don't want.  */
 
-#define MOTOROLA	/* Use Motorola syntax */
-#define USE_GAS		/* But GAS wants jbsr instead of jsr */
-
 
 /* The prefix for register names.  Note that REGISTER_NAMES
    is supposed to include this prefix.  Also note that this is NOT an
diff --git a/gcc/config/m68k/rtemself.h b/gcc/config/m68k/rtemself.h
index ea9ed2df249..5945f76c7e6 100644
--- a/gcc/config/m68k/rtemself.h
+++ b/gcc/config/m68k/rtemself.h
@@ -20,8 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-#define MOTOROLA       /* Use Motorola syntax rather than MIT.  */
-
 /* Target OS builtins.  */
 #undef TARGET_OS_CPP_BUILTINS	/* Defined in m68kemb.h.  */
 #define TARGET_OS_CPP_BUILTINS()		\