Remove MPW support from ld

Stan Shebs shebs@apple.com
Wed Mar 31 01:29:00 GMT 2004


This patch scrubs MPW support from ld. Tested by building a random
target and seeing no complaints.

Stan

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.

Index: Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.150
diff -p -r1.150 Makefile.am
*** Makefile.am 30 Mar 2004 14:04:22 -0000      1.150
--- Makefile.am 30 Mar 2004 19:54:54 -0000
*************** dep-am: DEP
*** 1661,1689 ****
 
  .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.
--- 1661,1666 ----
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/ld/Makefile.in,v
retrieving revision 1.162
diff -p -r1.162 Makefile.in
*** Makefile.in 30 Mar 2004 14:04:22 -0000      1.162
--- Makefile.in 30 Mar 2004 19:54:55 -0000
*************** dep-am: DEP
*** 2361,2389 ****
 
  .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.
--- 2361,2366 ----
Index: ldfile.c
===================================================================
RCS file: /cvs/src/src/ld/ldfile.c,v
retrieving revision 1.34
diff -p -r1.34 ldfile.c
*** ldfile.c    3 Jan 2004 11:09:06 -0000       1.34
--- ldfile.c    30 Mar 2004 19:54:56 -0000
*************** unsigned long ldfile_output_machine;
*** 44,50 ****
  enum bfd_architecture ldfile_output_architecture;
  search_dirs_type * search_head;
 
- #ifndef MPW
  #ifdef VMS
  char * slash = "";
  #else
--- 44,49 ----
*************** char * slash = "\\";
*** 54,63 ****
  char * slash = "/";
  #endif
  #endif
- #else /* MPW */
- /* The MPW path char is a colon.  */
- char * slash = ":";
- #endif /* MPW */
 
  typedef struct search_arch
  {
--- 53,58 ----
Index: ldlex.l
===================================================================
RCS file: /cvs/src/src/ld/ldlex.l,v
retrieving revision 1.22
diff -p -r1.22 ldlex.l
*** ldlex.l     24 Oct 2003 14:55:13 -0000      1.22
--- ldlex.l     30 Mar 2004 19:54:56 -0000
*************** This was written by steve chamberlain
*** 28,38 ****
 
  #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"
--- 28,33 ----



More information about the Binutils mailing list