diff options
| -rw-r--r-- | ld/ChangeLog | 9 | ||||
| -rw-r--r-- | ld/Makefile.am | 23 | ||||
| -rw-r--r-- | ld/Makefile.in | 23 | ||||
| -rw-r--r-- | ld/ldfile.c | 5 | ||||
| -rw-r--r-- | ld/ldlex.l | 5 | ||||
| -rw-r--r-- | ld/mac-ld.r | 42 | ||||
| -rw-r--r-- | ld/mpw-config.in | 52 | ||||
| -rw-r--r-- | ld/mpw-make.sed | 95 |
8 files changed, 9 insertions, 245 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 8943f11..6ff7498 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,12 @@ +2004-03-30 Stan Shebs <shebs@apple.com> + + Remove long-obsolete MPW support. + * mpw-config.in, mpw-make.sed, mac-ld.r: Remove files. + * Makefile.am (mpw): Remove file-presynthesizing actions. + * Makefile.in: Likewise. + * ldfile.c (slash): Remove MPW case. + * ldlex.l [MPW]: Remove unused definition. + 2004-03-30 Galit Heller <Galit.Heller@nsc.com> * Makefile.am (ALL_EMULATIONS): Add eelf32cr16c.o. diff --git a/ld/Makefile.am b/ld/Makefile.am index 656ded2..21ec032 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -1661,29 +1661,6 @@ dep-am: DEP .PHONY: dep dep-in dep-am -@MAINT@.PHONY: mpw -@MAINT@mpw: $(srcdir)/mpw-ei386go32.c $(srcdir)/mpw-elfmips.c \ -@MAINT@ $(srcdir)/mpw-em68kcoff.c $(srcdir)/mpw-eppcmac.c \ -@MAINT@ $(srcdir)/mpw-esh.c $(srcdir)/mpw-idtmips.c -@MAINT@ -@MAINT@$(srcdir)/mpw-ei386go32.c: ei386go32.c -@MAINT@ $(srcdir)/../move-if-change $< $@ -@MAINT@ -@MAINT@$(srcdir)/mpw-elfmips.c: eelf32ebmip.c -@MAINT@ $(srcdir)/../move-if-change $< $@ -@MAINT@ -@MAINT@$(srcdir)/mpw-em68kcoff.c: em68kcoff.c -@MAINT@ $(srcdir)/../move-if-change $< $@ -@MAINT@ -@MAINT@$(srcdir)/mpw-eppcmac.c: eppcmacos.c -@MAINT@ $(srcdir)/../move-if-change $< $@ -@MAINT@ -@MAINT@$(srcdir)/mpw-esh.c: esh.c -@MAINT@ $(srcdir)/../move-if-change $< $@ -@MAINT@ -@MAINT@$(srcdir)/mpw-idtmips.c: emipsidt.c -@MAINT@ $(srcdir)/../move-if-change $< $@ - # What appears below is generated by a hacked mkdep using gcc -MM. # DO NOT DELETE THIS LINE -- mkdep uses it. diff --git a/ld/Makefile.in b/ld/Makefile.in index 0075163..a40f911 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -2361,29 +2361,6 @@ dep-am: DEP .PHONY: dep dep-in dep-am -@MAINT@.PHONY: mpw -@MAINT@mpw: $(srcdir)/mpw-ei386go32.c $(srcdir)/mpw-elfmips.c \ -@MAINT@ $(srcdir)/mpw-em68kcoff.c $(srcdir)/mpw-eppcmac.c \ -@MAINT@ $(srcdir)/mpw-esh.c $(srcdir)/mpw-idtmips.c -@MAINT@ -@MAINT@$(srcdir)/mpw-ei386go32.c: ei386go32.c -@MAINT@ $(srcdir)/../move-if-change $< $@ -@MAINT@ -@MAINT@$(srcdir)/mpw-elfmips.c: eelf32ebmip.c -@MAINT@ $(srcdir)/../move-if-change $< $@ -@MAINT@ -@MAINT@$(srcdir)/mpw-em68kcoff.c: em68kcoff.c -@MAINT@ $(srcdir)/../move-if-change $< $@ -@MAINT@ -@MAINT@$(srcdir)/mpw-eppcmac.c: eppcmacos.c -@MAINT@ $(srcdir)/../move-if-change $< $@ -@MAINT@ -@MAINT@$(srcdir)/mpw-esh.c: esh.c -@MAINT@ $(srcdir)/../move-if-change $< $@ -@MAINT@ -@MAINT@$(srcdir)/mpw-idtmips.c: emipsidt.c -@MAINT@ $(srcdir)/../move-if-change $< $@ - # What appears below is generated by a hacked mkdep using gcc -MM. # DO NOT DELETE THIS LINE -- mkdep uses it. diff --git a/ld/ldfile.c b/ld/ldfile.c index a6f0d60..e7a7d8c 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -44,7 +44,6 @@ unsigned long ldfile_output_machine; enum bfd_architecture ldfile_output_architecture; search_dirs_type * search_head; -#ifndef MPW #ifdef VMS char * slash = ""; #else @@ -54,10 +53,6 @@ char * slash = "\\"; char * slash = "/"; #endif #endif -#else /* MPW */ -/* The MPW path char is a colon. */ -char * slash = ":"; -#endif /* MPW */ typedef struct search_arch { @@ -28,11 +28,6 @@ This was written by steve chamberlain #include <stdio.h> -#ifdef MPW -/* Prevent enum redefinition problems. */ -#define TRUE_FALSE_ALREADY_DEFINED -#endif /* MPW */ - #include "bfd.h" #include "sysdep.h" #include "safe-ctype.h" diff --git a/ld/mac-ld.r b/ld/mac-ld.r deleted file mode 100644 index b316fc5..0000000 --- a/ld/mac-ld.r +++ /dev/null @@ -1,42 +0,0 @@ -/* Resources for GNU LD. */ - -#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, - "GLD " 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/ld/mpw-config.in b/ld/mpw-config.in deleted file mode 100644 index b2542cc..0000000 --- a/ld/mpw-config.in +++ /dev/null @@ -1,52 +0,0 @@ -# Configuration fragment for LD. - -If "{target_canonical}" =~ /m68k-apple-macos/ - Set emulname m68kcoff - forward-include "{srcdir}"mpw-em68kcoff.c em68kcoff.c - Set emulation_ofiles "{o}"em68kcoff.c.o - -Else If "{target_canonical}" =~ /powerpc-apple-macos/ - Set emulname ppcmacos - forward-include "{srcdir}"mpw-eppcmac.c eppcmacos.c - Set emulation_ofiles "{o}"eppcmacos.c.o - -Else If "{target_canonical}" =~ /i386-\Option-x-go32/ - Set emulname i386go32 - forward-include "{srcdir}"mpw-ei386go32.c ei386go32.c - Set emulation_ofiles "{o}"ei386go32.c.o - -Else If "{target_canonical}" =~ /mips-\Option-x-ecoff/ - Set emulname mipsidt - forward-include "{srcdir}"mpw-idtmips.c emipsidt.c - Set emulation_ofiles "{o}"emipsidt.c.o - -Else If "{target_canonical}" =~ /mips-\Option-x-\Option-x/ - Set emulname elf32ebmip - forward-include "{srcdir}"mpw-elfmips.c eelf32ebmip.c - Set emulation_ofiles "{o}"eelf32ebmip.c.o - -Else If "{target_canonical}" =~ /sh-\Option-x-hms/ - Set emulname sh - forward-include "{srcdir}"mpw-esh.c esh.c - Set emulation_ofiles "{o}"esh.c.o -End If - -Echo '/* This file is automatically generated. DO NOT EDIT! */' > "{o}"ldemul-tmp.h -Echo "extern ld_emulation_xfer_type ld_{emulname}_emulation;" >> "{o}"ldemul-tmp.h -Echo '#define EMULATION_LIST \' >> "{o}"ldemul-tmp.h -Echo " &ld_{emulname}_emulation, \" >> "{o}"ldemul-tmp.h -Echo ' 0' >> "{o}"ldemul-tmp.h - -MoveIfChange "{o}"ldemul-tmp.h "{o}"ldemul-list.h - -Echo '# From mpw-config.in' > "{o}"mk.tmp -Echo "EMUL = " {emulname} >> "{o}"mk.tmp -Echo "EMULATION_OFILES = " {emulation_ofiles} >> "{o}"mk.tmp -Echo 'version = ' `Search 'ld version ' {srcdir}ldver.c | sed -e 's/.*ld version \([^ ]*\).*/\1/'` >> "{o}"mk.tmp -Echo "TDEFINES = " >> "{o}"mk.tmp -Echo '# End from mpw-config.in' >> "{o}"mk.tmp - -Echo '/* config.h. Generated by mpw-configure. */' > "{o}"config.new -Echo '#include "mpw.h"' >> "{o}"config.new - -MoveIfChange "{o}"config.new "{o}"config.h diff --git a/ld/mpw-make.sed b/ld/mpw-make.sed deleted file mode 100644 index c919708..0000000 --- a/ld/mpw-make.sed +++ /dev/null @@ -1,95 +0,0 @@ -# Sed commands to finish translating the ld Makefile.in into MPW syntax. - -/HDEFINES/s/@HDEFINES@// - -/^target_alias = @target_alias@/s/^/#/ - -/^EMUL = @EMUL@/s/^/#/ - -/^EMULATION_OFILES = @EMULATION_OFILES@/s/^/#/ - -# Fixadd to the include paths. -/^INCLUDES = .*$/s/$/ -i "{INCDIR}":mpw: -i ::extra-include:/ -/BFDDIR/s/-i {BFDDIR} /-i "{BFDDIR}": / -/INCDIR/s/-i {INCDIR} /-i "{INCDIR}": / - -# Use byacc instead of bison (for now anyway). -/BISON/s/^BISON =.*$/BISON = byacc/ -#/BISONFLAGS/s/^BISONFLAGS =.*$/BISONFLAGS = / - -# Suppress the suppression of smart makes. -/^\.y\.c/d - -# Hack up ldmain compile. -/^"{o}"ldmain.c.o \\Option-f .* config.status$/,/^$/c\ -"{o}"ldmain.c.o \\Option-f "{s}"ldmain.c\ - {CC} @DASH_C_FLAG@ -d DEFAULT_EMULATION={dq}{EMUL}{dq} -d SCRIPTDIR={dq}{scriptdir}{dq} {ALL_CFLAGS} "{s}"ldmain.c -o "{o}"ldmain.c.o\ - - -# Remove ldemul-list.h build, rely on configure to make one. -/^ldemul-list.h /,/Rename -y "{s}"ldemul-tmp.h /d - -# Fix pathnames to generated files. -/config.h/s/"{s}"config\.h/"{o}"config.h/g -/config.h/s/^config\.h/"{o}"config.h/ - -/y.tab.c/s/"{s}"y\.tab\.c/"{o}"y.tab.c/g -/y.tab.c/s/^y\.tab\.c/"{o}"y.tab.c/ -/y.tab.h/s/"{s}"y\.tab\.h/"{o}"y.tab.h/g -/y.tab.h/s/^y\.tab\.h/"{o}"y.tab.h/ - -/ldgram.c/s/"{s}"ldgram\.c/"{o}"ldgram.c/g -/ldgram.c/s/^ldgram\.c/"{o}"ldgram.c/ - -/ldgram.h/s/"{s}"ldgram\.h/"{o}"ldgram.h/g -/ldgram.h/s/^ldgram\.h/"{o}"ldgram.h/ - -/ldlex.c/s/"{s}"ldlex\.c/"{o}"ldlex.c/g -/ldlex.c/s/^ldlex\.c/"{o}"ldlex.c/ - -/ldlex.c.new/s/"{s}"ldlex\.c\.new/"{o}"ldlex.c.new/g - -/lex.yy.c/s/"{s}"lex\.yy\.c/"{o}"lex.yy.c/g - -/ldemul-list.h/s/"{s}"ldemul-list\.h/"{o}"ldemul-list.h/g -/ldemul-list.h/s/^ldemul-list\.h/"{o}"ldemul-list.h/ - -# Edit pathnames to emulation files. -/"{s}"e.*\.c/s/"{s}"e\([-_a-z0-9]*\)\.c/"{o}"e\1.c/g -/^e.*\.c/s/^e\([-_a-z0-9]*\)\.c/"{o}"e\1.c/ - -# We can't run genscripts, so don't try. -/{GENSCRIPTS}/s/{GENSCRIPTS}/null-command/ - -# Comment out the TDIRS bits. -/^TDIRS@/s/^/#/ - -# Point at the BFD library directly. -/@BFDLIB@/s/@BFDLIB@/::bfd:libbfd.o/ - -# Don't need this. -/@HLDFLAGS@/s/@HLDFLAGS@// - -#/sed.*free/,/> "{o}"ldlex.c.new/c\ -# \ Catenate "{o}"lex.yy.c >"{o}"ldlex.c.new - -# The resource file is called mac-ld.r. -/{LD_PROG}.r/s/{LD_PROG}\.r/mac-ld.r/ - -/^install \\Option-f /,/^$/c\ -install \\Option-f all install-only\ -\ -install-only \\Option-f\ - NewFolderRecursive "{bindir}"\ - Duplicate -y :ld.new "{bindir}"ld\ - - -# Remove dependency rebuilding crud. -/^.dep /,/# .PHONY /d - -# Remove the lintlog action, pipe symbols in column 1 lose. -/^lintlog \\Option-f/,/^$/d - -/^Makefile \\Option-f/,/^$/d -/^"{o}"config.h \\Option-f/,/^$/d -/^config.status \\Option-f/,/^$/d |