5 files changed, 3 insertions, 8 deletions

diff --git a/gnu/usr.bin/binutils/Makefile.inc b/gnu/usr.bin/binutils/Makefile.inc
index a988a12b94660..929ef50f5b4d1 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 6c42e2a42ad36..95c340d713b5b 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 831b8761fd230..ef892e7adcd12 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 4088b2c2fd78a..ecea234c0a371 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 2eb114f9d22bd..f283f862e2143 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