Remove MPW support, no longer used.

* config.bfd (powerpc-*-mpw*): Remove configuration.
        * mpw-config.in, mpw-make.sed: Remove files.
        * ecoffswap.h [MPW_C]: Remove MPW-C-friendly version of code.
This commit is contained in:
Stan Shebs 2004-03-27 05:45:50 +00:00
parent fd066bdbc9
commit 14bde3788a
5 changed files with 8 additions and 242 deletions

View File

@ -1,3 +1,10 @@
2004-03-26 Stan Shebs <shebs@apple.com>
Remove MPW support, no longer used.
* config.bfd (powerpc-*-mpw*): Remove configuration.
* mpw-config.in, mpw-make.sed: Remove files.
* ecoffswap.h [MPW_C]: Remove MPW-C-friendly version of code.
2004-03-26 Alan Modra <amodra@bigpond.net.au>
* elf64-ppc.c (elf_backend_add_symbol_hook): Define.

View File

@ -969,7 +969,7 @@ case "${targ}" in
targ_selvecs="mach_o_be_vec mach_o_le_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
targ_archs="bfd_powerpc_arch bfd_rs6000_arch bfd_i386_arch"
;;
powerpc-*-macos* | powerpc-*-mpw*)
powerpc-*-macos*)
targ_defvec=pmac_xcoff_vec
;;
powerpc-*-netware*)

View File

@ -324,8 +324,6 @@ ecoff_swap_fdr_out (abfd, intern_copy, ext_ptr)
#endif
}
#ifndef MPW_C
/* Swap in the procedure descriptor record. */
static void
@ -454,78 +452,6 @@ ecoff_swap_pdr_out (abfd, intern_copy, ext_ptr)
#endif
}
#else /* MPW_C */
/* Same routines, but with ECOFF_64 code removed, so ^&%$#&! MPW C doesn't
corrupt itself and then freak out. */
/* Swap in the procedure descriptor record. */
static void
ecoff_swap_pdr_in (abfd, ext_copy, intern)
bfd *abfd;
PTR ext_copy;
PDR *intern;
{
struct pdr_ext ext[1];
*ext = *(struct pdr_ext *) ext_copy;
intern->adr = ECOFF_GET_OFF (abfd, ext->p_adr);
intern->isym = H_GET_32 (abfd, ext->p_isym);
intern->iline = H_GET_32 (abfd, ext->p_iline);
intern->regmask = H_GET_32 (abfd, ext->p_regmask);
intern->regoffset = H_GET_S32 (abfd, ext->p_regoffset);
intern->iopt = H_GET_S32 (abfd, ext->p_iopt);
intern->fregmask = H_GET_32 (abfd, ext->p_fregmask);
intern->fregoffset = H_GET_S32 (abfd, ext->p_fregoffset);
intern->frameoffset = H_GET_S32 (abfd, ext->p_frameoffset);
intern->framereg = H_GET_16 (abfd, ext->p_framereg);
intern->pcreg = H_GET_16 (abfd, ext->p_pcreg);
intern->lnLow = H_GET_32 (abfd, ext->p_lnLow);
intern->lnHigh = H_GET_32 (abfd, ext->p_lnHigh);
intern->cbLineOffset = ECOFF_GET_OFF (abfd, ext->p_cbLineOffset);
#ifdef TEST
if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
abort ();
#endif
}
/* Swap out the procedure descriptor record. */
static void
ecoff_swap_pdr_out (abfd, intern_copy, ext_ptr)
bfd *abfd;
const PDR *intern_copy;
PTR ext_ptr;
{
struct pdr_ext *ext = (struct pdr_ext *) ext_ptr;
PDR intern[1];
/* Make it reasonable to do in-place. */
*intern = *intern_copy;
ECOFF_PUT_OFF (abfd, intern->adr, ext->p_adr);
H_PUT_32 (abfd, intern->isym, ext->p_isym);
H_PUT_32 (abfd, intern->iline, ext->p_iline);
H_PUT_32 (abfd, intern->regmask, ext->p_regmask);
H_PUT_32 (abfd, intern->regoffset, ext->p_regoffset);
H_PUT_32 (abfd, intern->iopt, ext->p_iopt);
H_PUT_32 (abfd, intern->fregmask, ext->p_fregmask);
H_PUT_32 (abfd, intern->fregoffset, ext->p_fregoffset);
H_PUT_32 (abfd, intern->frameoffset, ext->p_frameoffset);
H_PUT_16 (abfd, intern->framereg, ext->p_framereg);
H_PUT_16 (abfd, intern->pcreg, ext->p_pcreg);
H_PUT_32 (abfd, intern->lnLow, ext->p_lnLow);
H_PUT_32 (abfd, intern->lnHigh, ext->p_lnHigh);
ECOFF_PUT_OFF (abfd, intern->cbLineOffset, ext->p_cbLineOffset);
#ifdef TEST
if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
abort ();
#endif
}
#endif /* MPW_C */
/* Swap in a symbol record. */
static void

View File

@ -1,86 +0,0 @@
# Configuration fragment for BFD.
# This is almost always correct.
Set selarchs "&bfd_{target_cpu}_arch"
Set defvec ""
Set selvecs ""
Set havevecs ""
If "{target_canonical}" =~ /m68k-apple-macos/
Set BFD_BACKENDS '"{o}"coff-m68k.c.o "{o}"cofflink.c.o'
Set defvec m68kcoff_vec
Set selvecs '&m68kcoff_vec'
Set havevecs '-d HAVE_m68kcoff_vec'
Else If "{target_canonical}" =~ /powerpc-apple-macos/
Set BFD_BACKENDS '"{o}"coff-pmac.c.o "{o}"xcofflink.c.o'
Set defvec pmac_xcoff_vec
Set selvecs '&pmac_xcoff_vec'
Set havevecs '-d HAVE_pmac_xcoff_vec'
Set selarchs "&bfd_powerpc_arch"
Else If "{target_canonical}" =~ /i386-\Option-x-go32/
Set BFD_BACKENDS '"{o}"coff-i386.c.o'
Set defvec i386coff_vec
Set selvecs '&i386coff_vec'
Set havevecs '-d HAVE_i386coff_vec'
Else If "{target_canonical}" =~ /mips-\Option-x-\Option-x/
Set BFD_BACKENDS '"{o}"coff-mips.c.o "{o}"ecoff.c.o "{o}"ecofflink.c.o "{o}"elf32.c.o "{o}"elf32-mips.c.o "{o}"elflink.c.o'
Set defvec ecoff_big_vec
Set selvecs '&ecoff_big_vec,&ecoff_little_vec,&bfd_elf32_bigmips_vec'
Set havevecs '-d HAVE_ecoff_big_vec -d HAVE_ecoff_little_vec -d HAVE_bfd_elf32_bigmips_vec'
Else If "{target_canonical}" =~ /sh-\Option-x-hms/
Set BFD_BACKENDS '"{o}"coff-sh.c.o "{o}"cofflink.c.o'
Set defvec shcoff_vec
Set selvecs '&shcoff_vec,&shlcoff_vec'
Set havevecs '-d HAVE_shcoff_vec -d HAVE_shlcoff_vec'
End If
Set ta `echo {selarchs} | sed -e 's/&bfd_/{o}cpu-/g' -e 's/_arch/.c.o/g'`
Set tdefaults "-d DEFAULT_VECTOR={defvec} -d SELECT_VECS={selvecs} -d SELECT_ARCHITECTURES={selarchs} {havevecs}"
Echo '# From mpw-config.in' > "{o}"mk.tmp
Echo 'WORDSIZE = 32' >> "{o}"mk.tmp
Echo 'BFD_MACHINES = ' {ta} >> "{o}"mk.tmp
Echo 'BFD_BACKENDS = ' {BFD_BACKENDS} >> "{o}"mk.tmp
Echo 'TDEFAULTS = ' {tdefaults} >> "{o}"mk.tmp
Echo 'HDEPFILES = ' >> "{o}"mk.tmp
Echo 'TDEPFILES = ' >> "{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
# We can only handle 32-bit targets right now.
sed -e 's/@WORDSIZE@/32/' \Option-d
-e 's/@wordsize@/32/' \Option-d
-e "s/@VERSION@/`Catenate {srcdir}VERSION`/" \Option-d
-e 's/@BFD_HOST_64_BIT_DEFINED@/0/' \Option-d
-e 's/@BFD_HOST_64_BIT@//' \Option-d
-e 's/@BFD_HOST_U_64_BIT@//' \Option-d
-e 's/@BFD_HOST_64BIT_LONG@/0/' \Option-d
"{srcdir}"bfd-in2.h >"{o}"bfd.h-new
MoveIfChange "{o}"bfd.h-new "{o}"bfd.h
sed -e 's/NN/32/g' "{srcdir}"elfxx-target.h >"{o}"elf32-target.h-new
MoveIfChange "{o}"elf32-target.h-new "{o}"elf32-target.h
# Pre-expand some macros in coffswap.h, so MPW C doesn't choke.
sed -e 's/^ PUT_AOUTHDR_TSIZE (/ bfd_h_put_32 (/' \Option-d
-e 's/^ PUT_AOUTHDR_DSIZE (/ bfd_h_put_32 (/' \Option-d
-e 's/^ PUT_AOUTHDR_BSIZE (/ bfd_h_put_32 (/' \Option-d
-e 's/^ PUT_AOUTHDR_ENTRY (/ bfd_h_put_32 (/' \Option-d
-e 's/^ PUT_AOUTHDR_TEXT_START (/ bfd_h_put_32 (/' \Option-d
-e 's/^ PUT_AOUTHDR_DATA_START (/ bfd_h_put_32 (/' \Option-d
"{srcdir}"coffswap.h >"{o}"coffswap.h-new
MoveIfChange "{o}"coffswap.h-new "{o}"coffswap.h

View File

@ -1,81 +0,0 @@
# Sed commands to finish translating the Unix BFD Makefile into MPW syntax.
# Whack out unused host and target define bits.
/HDEFINES/s/@HDEFINES@//
/TDEFINES/s/@TDEFINES@//
# Fix pathnames to include directories.
/^INCDIR = /s/^INCDIR = .*$/INCDIR = "{topsrcdir}"include/
/^CSEARCH = /s/$/ -i "{INCDIR}":mpw: -i ::extra-include:/
# Comment out setting of vars, configure script will add these itself.
/^WORDSIZE =/s/^/#/
# /^ALL_BACKENDS/s/^/#/
/^BFD_BACKENDS/s/^/#/
/^BFD_MACHINES/s/^/#/
/^TDEFAULTS/s/^/#/
# Remove extra, useless, "all".
/^all \\Option-f _oldest/,/^$/d
# Remove the Makefile rebuild rule.
/^Makefile /,/--recheck/d
# Don't do any recursive subdir stuff.
/ subdir_do/s/{MAKE}/null-command/
/BFD_H/s/^{BFD_H}/#{BFD_H}/
# Add explicit srcdir paths to special files.
/config.bfd/s/ config.bfd/ "{s}"config.bfd/g
/targmatch.sed/s/ targmatch.sed/ "{s}"targmatch.sed/g
# Point at include files that are always in the objdir.
/bfd/s/"{s}"bfd\.h/"{o}"bfd.h/g
/config/s/"{s}"config\.h/"{o}"config.h/g
/targmatch/s/"{s}"targmatch\.h/"{o}"targmatch.h/g
/targmatch/s/^targmatch\.h/"{o}"targmatch.h/
/elf32-target/s/"{s}"elf32-target\.h/"{o}"elf32-target.h/g
/elf32-target/s/^elf32-target\.h/"{o}"elf32-target.h/
/elf64-target/s/"{s}"elf64-target\.h/"{o}"elf64-target.h/g
/elf64-target/s/^elf64-target\.h/"{o}"elf64-target.h/
/"{s}"{INCDIR}/s/"{s}"{INCDIR}/"{INCDIR}"/g
/dep/s/\.dep/__dep/g
# Removing duplicates is cool but presently unnecessary,
# so whack this out.
/^ofiles \\Option-f/,/^$/d
/ofiles/s/{OFILES} ofiles/{OFILES}/
/echo ofiles = /d
/cat ofiles/s/`cat ofiles`/{OFILES}/
# No corefile support.
/COREFILE/s/@COREFILE@//
/COREFLAG/s/@COREFLAG@//
# No PIC foolery in this environment.
/@ALLLIBS@/s/@ALLLIBS@/{TARGETLIB}/
/@PICLIST@/s/@PICLIST@//
/@PICFLAG@/s/@PICFLAG@//
/^{OFILES} \\Option-f stamp-picdir/,/^$/d
# Remove the pic trickery from the default build rule.
/^\.c\.o \\Option-f /,/End If/c\
.c.o \\Option-f .c
# MPW Make doesn't know about $<.
/"{o}"targets.c.o \\Option-f "{s}"targets.c Makefile/,/^$/c\
"{o}"targets.c.o \\Option-f "{s}"targets.c Makefile\
{CC} @DASH_C_FLAG@ {ALL_CFLAGS} {TDEFAULTS} "{s}"targets.c -o "{o}"targets.c.o
/"{o}"archures.c.o \\Option-f "{s}"archures.c Makefile/,/^$/c\
"{o}"archures.c.o \\Option-f "{s}"archures.c Makefile\
{CC} @DASH_C_FLAG@ {ALL_CFLAGS} {TDEFAULTS} "{s}"archures.c -o "{o}"archures.c.o
# Remove the .h rebuilding rules, we don't currently have a doc subdir,
# or a way to build the prototype-hacking tool that's in it.
/^"{srcdir}"bfd-in2.h \\Option-f /,/^$/d
/^"{srcdir}"libbfd.h \\Option-f /,/^$/d
/^"{srcdir}"libcoff.h \\Option-f /,/^$/d