diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 7 | ||||
| -rwxr-xr-x | gas/configure | 2 | ||||
| -rw-r--r-- | gas/configure.in | 2 | ||||
| -rw-r--r-- | gas/mac-as.r | 42 | ||||
| -rw-r--r-- | gas/mpw-config.in | 115 | ||||
| -rw-r--r-- | gas/mpw-make.sed | 96 | ||||
| -rw-r--r-- | gas/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gas/testsuite/gas/macros/macros.exp | 2 |
8 files changed, 14 insertions, 256 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index e4b5532..444d9d6 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2004-03-30 Stan Shebs <shebs@apple.com> + + Remove long-obsolete MPW support. + * mpw-config.in, mpw-make.sed, mac-as.r: Remove files. + * configure.in: Remove mention of ppc-*-mpw* config. + * configure.in: Likewise. + 2004-03-30 Nick Clifton <nickc@redhat.com> * config/tc-arm.c (meabi_flags): Make its use conditional upon diff --git a/gas/configure b/gas/configure index d663f72..3514954 100755 --- a/gas/configure +++ b/gas/configure @@ -4482,7 +4482,7 @@ echo "$as_me: error: Solaris must be configured little endian" >&2;} { (exit 1); exit 1; }; } fi ;; ppc-*-rtems*) fmt=elf ;; - ppc-*-macos* | ppc-*-mpw*) fmt=coff em=macos ;; + ppc-*-macos*) fmt=coff em=macos ;; ppc-*-netware*) fmt=elf em=ppcnw ;; ppc-**-nto*) fmt=elf ;; ppc-*-kaos*) fmt=elf ;; diff --git a/gas/configure.in b/gas/configure.in index bdcddde..27752ce 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -433,7 +433,7 @@ changequote([,])dnl AC_MSG_ERROR(Solaris must be configured little endian) fi ;; ppc-*-rtems*) fmt=elf ;; - ppc-*-macos* | ppc-*-mpw*) fmt=coff em=macos ;; + ppc-*-macos*) fmt=coff em=macos ;; ppc-*-netware*) fmt=elf em=ppcnw ;; ppc-**-nto*) fmt=elf ;; ppc-*-kaos*) fmt=elf ;; diff --git a/gas/mac-as.r b/gas/mac-as.r deleted file mode 100644 index f36c033..0000000 --- a/gas/mac-as.r +++ /dev/null @@ -1,42 +0,0 @@ -/* Resources for GNU AS. */ - -#include "SysTypes.r" - -/* Version resources. */ - -resource 'vers' (1) { - 0, - 0, - 0, - 0, - verUs, - VERSION_STRING, - VERSION_STRING " (C) 1986-95 FSF, Inc." -}; - -resource 'vers' (2, purgeable) { - 0, - 0, - 0, - 0, - verUs, - VERSION_STRING, - "GAS " VERSION_STRING " for MPW" -}; - -#ifdef WANT_CFRG - -#include "CodeFragmentTypes.r" - -resource 'cfrg' (0) { - { - kPowerPC, - kFullLib, - kNoVersionNum, kNoVersionNum, - 0,0, - kIsApp, kOnDiskFlat, kZeroOffset, kWholeFork, - PROG_NAME - } -}; - -#endif /* WANT_CFRG */ diff --git a/gas/mpw-config.in b/gas/mpw-config.in deleted file mode 100644 index 9e29b1d..0000000 --- a/gas/mpw-config.in +++ /dev/null @@ -1,115 +0,0 @@ -# Configuration fragment for GAS. - -Set target_arch `echo {target_canonical} | sed -e 's/-.*-.*//'` - -If "{target_arch}" =~ /powerpc/ - Set short_arch_name "ppc" - Set target_cpu "powerpc" -Else - Set short_arch_name "{target_arch}" -End If - -# The following works for many configurations, though not all. - -Set obj_format `echo {target_canonical} | sed -e 's/.*-.*-//'` -Set target_os `echo {target_canonical} | sed -e 's/.*-.*-//'` - -Set bfd_gas no - -Set TDEFINES "" - -Set EXTRA_OBJECTS "" - -# Default emulation. - -Set em generic - -If "{target_canonical}" =~ /m68k-apple-macos/ - Set obj_format "coff" - Set TDEFINES '-d M68KCOFF' - Set EXTRA_OBJECTS '"{o}"m68k-parse.c.o' - -Else If "{target_canonical}" =~ /powerpc-apple-macos/ - Set obj_format "coff" - Set bfd_gas yes - Set em macos - -Else If "{target_canonical}" =~ /i386-\Option-x-go32/ - Set obj_format "coff" - Set TDEFINES '-d I386COFF' - -Else If "{target_canonical}" =~ /m68k-\Option-x-coff/ - Set TDEFINES '-d M68KCOFF' - -Else If "{target_canonical}" =~ /mips-idt-ecoff/ - Set bfd_gas yes - Set TDEFINES '-d TARGET_BYTES_BIG_ENDIAN=1' - -Else If "{target_canonical}" =~ /mips-\Option-x-\Option-x/ - # Assume other OSes etc use ELF - Set obj_format "elf" - Set bfd_gas yes - Set TDEFINES '-d TARGET_BYTES_BIG_ENDIAN=1' - forward-include "{srcroot}"bfd:elf-bfd.h 'bfd/elf-bfd.h' - -Else If "{target_canonical}" =~ /sh-\Option-x-hms/ - Set obj_format "coff" - forward-include "{srcroot}"opcodes:sh-opc.h 'opcodes/sh-opc.h' -End If - -forward-include "{srcdir}"config:tc-{short_arch_name}.c targ-cpu.c -forward-include "{srcdir}"config:tc-{short_arch_name}.h targ-cpu.h - -forward-include "{srcdir}"config:obj-{obj_format}.c obj-format.c -forward-include "{srcdir}"config:obj-{obj_format}.h obj-format.h - -forward-include "{srcdir}"config:te-{em}.h targ-env.h - -# Special cases for float handling. - -If "{target_arch}" =~ /ns32k/ - forward-include "{srcdir}"config:atof-ns32k.c atof-targ.c -Else If "{target_arch}" =~ /tahoe/ - forward-include "{srcdir}"config:atof-tahoe.c atof-targ.c -Else If "{target_arch}" =~ /vax/ - forward-include "{srcdir}"config:atof-vax.c atof-targ.c -Else - # Use IEEE by default. - forward-include "{srcdir}"config:atof-ieee.c atof-targ.c -End If - -Echo '# From mpw-config.in' > "{o}"mk.tmp -Echo "TDEFINES = " {TDEFINES} >> "{o}"mk.tmp -Echo "EXTRA_OBJECTS = " {EXTRA_OBJECTS} >> "{o}"mk.tmp -# (We use the -n option here so as not to get extra spaces inserted) -Echo -n 'TARG_CPU_DEP = {TARG_CPU_DEP_' >> "{o}"mk.tmp -Echo -n {short_arch_name} >> "{o}"mk.tmp -Echo -n '}' >> "{o}"mk.tmp -Echo '# End from mpw-config.in' >> "{o}"mk.tmp - -Echo '/* conf. Generated by mpw-configure. */' > "{o}"conf.new -Echo -n '#define TARGET_CPU "' >> "{o}"conf.new -Echo -n "{target_cpu}" >> "{o}"conf.new -Echo '"' >> "{o}"conf.new -Echo -n '#define TARGET_OS "' >> "{o}"conf.new -Echo -n "{target_os}" >> "{o}"conf.new -Echo '"' >> "{o}"conf.new -Echo -n '#define TARGET_ALIAS "' >> "{o}"conf.new -Echo -n "{target_alias}" >> "{o}"conf.new -Echo '"' >> "{o}"conf.new -Echo -n '#define TARGET_CANONICAL "' >> "{o}"conf.new -Echo -n "{target_canonical}" >> "{o}"conf.new -Echo '"' >> "{o}"conf.new -Echo '#include "mpw.h"' >> "{o}"conf.new -If "{bfd_gas}" =~ /yes/ - Echo "#define BFD_ASSEMBLER" >> "{o}"conf.new -Else - Echo "#define MANY_SEGMENTS" >> "{o}"conf.new -End If -Echo '#define CR_EOL' >> "{o}"conf.new -Echo '#define OBJ_COFF_OMIT_TIMESTAMP' >> "{o}"conf.new -Echo '#define LOSING_COMPILER' >> "{o}"conf.new - -MoveIfChange "{o}"conf.new "{o}"conf - -sed -e "s/@srcdir@/{srcdir}/" "{srcdir}"gdbinit.in > "{o}"_gdbinit diff --git a/gas/mpw-make.sed b/gas/mpw-make.sed deleted file mode 100644 index 3bcb0ce..0000000 --- a/gas/mpw-make.sed +++ /dev/null @@ -1,96 +0,0 @@ -# Sed commands that finish translating the GAS Unix Makefile to MPW syntax. - -/^# @target_frag@/a\ -\ -HDEFINES = \ -LOCAL_LOADLIBES = \ - -/^srcroot = /s/^/#/ -/^target_alias = /s/^/#/ - -/INCLUDES/s/-i "{srcdir}":\([a-z]*\)/-i "{topsrcdir}"\1/ -/INCLUDES/s/-i "{srcdir}"\.\./-i "{topsrcdir}"/ - -/^INCLUDES = .*$/s/$/ -i "{topsrcdir}"include:mpw: -i ::extra-include:/ - -/$(TARG_CPU_DEP_@target_cpu_type@)/s/$(TARG_CPU_DEP_@target_cpu_type@)/{TARG_CPU_DEP}/ - -/@OPCODES_LIB@/s/@OPCODES_LIB@/::opcodes:libopcodes.o/ -/@BFDLIB@/s/@BFDLIB@/::bfd:libbfd.o/ - -# Point at the libraries directly. -/@OPCODES_DEP@/s/@OPCODES_DEP@/::opcodes:libopcodes.o/ -/@BFDDEP@/s/@BFDDEP@/::bfd:libbfd.o/ - -# Don't need this. -/@HLDFLAGS@/s/@HLDFLAGS@// - -/extra_objects@/s/extra_objects@/{EXTRA_OBJECTS}/ - -/LOADLIBES/s/{LOADLIBES}/{EXTRALIBS}/ - -/@ALL_OBJ_DEPS@/s/@ALL_OBJ_DEPS@/::bfd:bfd.h/ - -# This causes problems - not sure why. -/^tags TAGS/,/etags /d - -/^make-gas.com/s/^/#/ - -/true/s/ ; @true$// - -# Remove references to conf.in, we don't need them. -/conf\.in/s/conf\.in//g - -# Use _gdbinit everywhere instead of .gdbinit. -/gdbinit/s/\.gdbinit/_gdbinit/g - -/atof-targ/s/"{s}"atof-targ\.c/"{o}"atof-targ.c/g -/config/s/"{s}"config\.h/"{o}"config.h/g -/config/s/^config\.h/"{o}"config.h/ -/obj-format/s/"{s}"obj-format\.c/"{o}"obj-format.c/g -/obj-format/s/"{s}"obj-format\.h/"{o}"obj-format.h/g -/targ-cpu/s/"{s}"targ-cpu\.c/"{o}"targ-cpu.c/g -/targ-cpu/s/"{s}"targ-cpu\.h/"{o}"targ-cpu.h/g -/targ-env/s/"{s}"targ-env\.h/"{o}"targ-env.h/g - -/m68k-parse.c/s/"{s}"m68k-parse\.c/"{o}"m68k-parse.c/g -/m68k-parse.c/s/^m68k-parse\.c/"{o}"m68k-parse.c/ - -# Whack out the config.h dependency, it only causes excess rebuilds. -/{OBJS}/s/{OBJS} \\Option-f "{o}"config.h/{OBJS} \\Option-f/ - -# ALL_CFLAGS includes TDEFINES, which is not desirable at link time. -/CC_LD/s/ALL_CFLAGS/CFLAGS/g - -# The resource file is called mac-as.r. -/as.new.r/s/as\.new\.r/mac-as.r/ - -# ...and the PROG_NAME doesn't have a .new in it. -/PROG_NAME/s/PROG_NAME='"'as.new'"'/PROG_NAME='"'as'"'/ - -# Whack out recursive makes, they won't work. -/^[ ][ ]*srcroot=/,/^[ ][ ]*(cd /d - -# Work around quoting problems by using multiple echo commands. -/'#define GAS_VERSION "{VERSION}"'/c\ - Echo -n '#define GAS_VERSION "' >> "{o}"config.new\ - Echo -n "{VERSION}" >> "{o}"config.new\ - Echo -n '"' >> "{o}"config.new - -# Add a "stamps" target. -$a\ -stamps \\Option-f config-stamp\ - -/^install \\Option-f/,/^$/c\ -install \\Option-f all install-only\ -\ -install-only \\Option-f\ - NewFolderRecursive "{bindir}"\ - Duplicate -y :as.new "{bindir}"as\ - - -# Whack out config-rebuilding targets, they won't work. -/^Makefile \\Option-f/,/^$/d -/^config.status \\Option-f/,/^$/d - -/^"{o}"config.h \\Option-f/s/^/#/ diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 5beb3a5..c11a82c 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2004-03-30 Stan Shebs <shebs@apple.com> + + * gas/macros/macros.exp: Remove mention of MPW config. + 2004-03-27 Alan Modra <amodra@bigpond.net.au> * gas/i860/dir-intel03-err.l: Update for junk at end line becoming diff --git a/gas/testsuite/gas/macros/macros.exp b/gas/testsuite/gas/macros/macros.exp index 19568d9..83dc4cf 100644 --- a/gas/testsuite/gas/macros/macros.exp +++ b/gas/testsuite/gas/macros/macros.exp @@ -35,7 +35,7 @@ if { ![istarget hppa*-*-*] || [istarget *-*-linux*] } { # These fail due to NO_STRING_ESCAPES setup_xfail "powerpc*-*-aix*" "powerpc*-*-beos*" "powerpc*-*-macos*" - setup_xfail "powerpc*-*-mpw*" "powerpc*-*-pe" "powerpc*-*-*win*" + setup_xfail "powerpc*-*-pe" "powerpc*-*-*win*" setup_xfail "rs6000-*-*" # FIXME: Due to difference in what "consecutive octets" means. |