diff options
author | Peter Wemm <peter@FreeBSD.org> | 2002-09-17 01:49:00 +0000 |
---|---|---|
committer | Peter Wemm <peter@FreeBSD.org> | 2002-09-17 01:49:00 +0000 |
commit | 66422f5b7a1a6055f0b2358268eb902aab6e2e3e (patch) | |
tree | 7d8147c99f6bfb34b7cb47ad46e24a4f7dc93102 /gnu | |
parent | 4e6ef0845de37f8c4a29410d48d3847da78a9c9f (diff) | |
download | src-66422f5b7a1a6055f0b2358268eb902aab6e2e3e.tar.gz src-66422f5b7a1a6055f0b2358268eb902aab6e2e3e.zip |
Initiate deorbit burn for the i386-only a.out related support. Moves are
under way to move the remnants of the a.out toolchain to ports. As the
comment in src/Makefile said, this stuff is deprecated and one should not
expect this to remain beyond 4.0-REL. It has already lasted WAY beyond
that.
Notable exceptions:
gcc - I have not touched the a.out generation stuff there.
ldd/ldconfig - still have some code to interface with a.out rtld.
old as/ld/etc - I have not removed these yet, pending their move to ports.
some includes - necessary for ldd/ldconfig for now.
Tested on: i386 (extensively), alpha
Notes
Notes:
svn path=/head/; revision=103436
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/lib/Makefile | 6 | ||||
-rw-r--r-- | gnu/lib/libgcc/Makefile | 7 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/Makefile.inc | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cc/c++filt/Makefile | 1 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cc_int/Makefile | 4 | ||||
-rw-r--r-- | gnu/usr.bin/gzip/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/gzip/match.S | 2 |
7 files changed, 3 insertions, 21 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 9c07c7c0769a..494f888d905f 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -2,12 +2,6 @@ SUBDIR= csu libgcc libdialog libregex libreadline -.if ${OBJFORMAT} == aout -.if !defined(NOLIBC_R) -SUBDIR+= libgcc_r -.endif -.endif - # libsupc++ uses libstdc++ headers, although 'make includes' should # have taken care of that already. .if !defined(NO_CXX) diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index ed19ee21e0f4..4a6adf6080bf 100644 --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -13,11 +13,6 @@ LIB= gcc #SHLIB_MAJOR= 1 #SHLIB_MINOR= 0 -.if ${OBJFORMAT} == aout -# Install libgcc_pic.a, since ld.so uses it. -INSTALL_PIC_ARCHIVE= yes -.endif - # # XXX This is a hack, but it seems to work. # libgcc2.a is meant to be compiled by *this* version of gcc. @@ -37,9 +32,7 @@ XCXX= ${CXX} CFLAGS+= -fexceptions CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \ -DFINE_GRAINED_LIBRARIES -.if ${OBJFORMAT} != aout CFLAGS+= -D_PTHREADS -DGTHREAD_USE_WEAK -.endif CFLAGS+= -I${.CURDIR}/../../usr.bin/cc/cc_tools \ -I${GCCDIR}/config -I${GCCDIR} -I. LDFLAGS= -nostdlib diff --git a/gnu/usr.bin/binutils/Makefile.inc b/gnu/usr.bin/binutils/Makefile.inc index a988a12b9466..929ef50f5b4d 100644 --- a/gnu/usr.bin/binutils/Makefile.inc +++ b/gnu/usr.bin/binutils/Makefile.inc @@ -1,6 +1,6 @@ # # $FreeBSD$ # +.include "../Makefile.inc" -BINDIR?= /usr/libexec/elf WARNS?= 3 diff --git a/gnu/usr.bin/cc/c++filt/Makefile b/gnu/usr.bin/cc/c++filt/Makefile index 6c42e2a42ad3..95c340d713b5 100644 --- a/gnu/usr.bin/cc/c++filt/Makefile +++ b/gnu/usr.bin/cc/c++filt/Makefile @@ -6,7 +6,6 @@ PROG= c++filt SRCS= cp-demangle.c cplus-dem+%DIKED.c -BINDIR= /usr/libexec/${OBJFORMAT} NOMAN= 1 CFLAGS+= -DMAIN -DIN_GCC -DVERSION=\"$(version)\" diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile index 831b8761fd23..ef892e7adcd1 100644 --- a/gnu/usr.bin/cc/cc_int/Makefile +++ b/gnu/usr.bin/cc/cc_int/Makefile @@ -71,11 +71,7 @@ CFLAGS+= -DTARGET_NAME=\"${target}\" -DIN_GCC CFLAGS+= -DTARGET_CPU_DEFAULT=${TARGET_CPU_DEFAULT} .endif -.if ${OBJFORMAT} == aout -UNDERSCORES= 1 -.else UNDERSCORES= 0 -.endif SRCS+= underscore.c CLEANFILES+= underscore.c underscore.c: Makefile diff --git a/gnu/usr.bin/gzip/Makefile b/gnu/usr.bin/gzip/Makefile index 4088b2c2fd78..ecea234c0a37 100644 --- a/gnu/usr.bin/gzip/Makefile +++ b/gnu/usr.bin/gzip/Makefile @@ -31,7 +31,7 @@ MLINKS+= zgrep.1 zfgrep.1 zgrep.1 zegrep.1 .endif match.o: ${.CURDIR}/match.S - $(CC) -E -traditional ${.CURDIR}/match.S >_match.s + $(CC) -E -DNO_UNDERLINE -traditional ${.CURDIR}/match.S >_match.s $(CC) -c _match.s mv -f _match.o match.o rm -f _match.s diff --git a/gnu/usr.bin/gzip/match.S b/gnu/usr.bin/gzip/match.S index 2eb114f9d22b..f283f862e214 100644 --- a/gnu/usr.bin/gzip/match.S +++ b/gnu/usr.bin/gzip/match.S @@ -14,7 +14,7 @@ /* Preprocess with -DNO_UNDERLINE if your C compiler does not prefix * external symbols with an underline character '_'. */ -#ifdef __ELF__ /* NO_UNDERLINE */ +#ifdef NO_UNDERLINE # define _prev prev # define _window window # define _match_start match_start |