summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.cross67
-rw-r--r--distrib/ramdisk/Makefile8
-rw-r--r--gnu/usr.bin/Makefile7
-rw-r--r--gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper19
-rw-r--r--gnu/usr.bin/binutils/Makefile.bsd-wrapper19
-rw-r--r--gnu/usr.bin/cxxfilt/Makefile13
-rw-r--r--lib/libc/dlfcn/Makefile.inc4
-rw-r--r--lib/librthread/Makefile7
-rw-r--r--libexec/ld.so/Makefile6
-rw-r--r--libexec/ld.so/ldconfig/Makefile6
-rw-r--r--libexec/ld.so/ldd/Makefile5
-rw-r--r--regress/libexec/ld.so/link-order/Makefile4
-rw-r--r--regress/libexec/ld.so/link-order/test/Makefile10
-rw-r--r--sbin/modload/Makefile10
-rw-r--r--share/mk/bsd.prog.mk4
-rw-r--r--usr.bin/ar/Makefile10
-rw-r--r--usr.bin/gprof/Makefile7
-rw-r--r--usr.bin/ranlib/Makefile10
-rw-r--r--usr.bin/rdist/Makefile4
-rw-r--r--usr.sbin/config/Makefile7
20 files changed, 27 insertions, 200 deletions
diff --git a/Makefile.cross b/Makefile.cross
index 6b3dde0ba3b..0af570cd678 100644
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.64 2013/04/04 10:45:33 jasper Exp $
+# $OpenBSD: Makefile.cross,v 1.65 2013/07/05 21:29:51 miod Exp $
cross-tools: cross-includes cross-binutils cross-gcc cross-lib
cross-distrib: cross-tools cross-bin cross-share cross-sys cross-etc-root-var
@@ -82,8 +82,6 @@ CROSSGCC= ${CROSSDIR}/.gcc_done
.include <bsd.own.mk>
-OLD_BINUTILS_ARCH=vax
-
.for _arch in ${TARGET_ARCH}
.if !empty(GCC2_ARCH:M${_arch})
COMPILER_VERSION=gcc2
@@ -108,14 +106,8 @@ NOPIE_FLAGS=
PIE_DEFAULT=
.endif
-.if !empty(OLD_BINUTILS_ARCH:M${_arch})
-NEW_BINUTILS?= No
-BINUTILS= ar as ld nm ranlib objcopy objdump strings strip
-.else
-NEW_BINUTILS?= Yes
BINUTILS= ar as gasp ld nm objcopy objdump ranlib readelf size \
strings strip
-.endif
BINUTILS_DIR=gnu/usr.bin/${BINUTILS_VERSION}
.endfor
@@ -147,10 +139,10 @@ cross-env:
${CROSSDIRS}:
.if ${TARGET_ARCH} == "arm" && ${MACHINE_IS_LP64} == "yes"
- # this config is allowed
+# this config is allowed
.elif ${TARGET_IS_LP64} != ${MACHINE_IS_LP64}
- @echo "host and target have different size longs"
- @echo "cross compiler generates bad code; aborting"; exit 1
+@echo "host and target have different size longs"
+@echo "cross compiler generates bad code; aborting"; exit 1
.endif
@-mkdir -p ${CROSSDIR}
@echo ${TARGET_ARCH} > ${CROSSDIR}/TARGET_ARCH
@@ -201,65 +193,20 @@ ${CROSSINCLUDES}: ${CROSSOBJ}
${CROSSBINUTILS}: ${CROSSINCLUDES}
(cd ${.CURDIR}/${BINUTILS_DIR}; \
MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- USING_NEW_BINUTILS=${NEW_BINUTILS} PIE_DEFAULT=${PIE_DEFAULT} \
+ PIE_DEFAULT=${PIE_DEFAULT} \
TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
PATH=${CROSSPATH} \
${MAKE} -f Makefile.bsd-wrapper depend && \
MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- USING_NEW_BINUTILS=${NEW_BINUTILS} PIE_DEFAULT=${PIE_DEFAULT} \
+ PIE_DEFAULT=${PIE_DEFAULT} \
TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
${MAKE} -f Makefile.bsd-wrapper all && \
DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
COMPILER_VERSION=${COMPILER_VERSION} \
- USING_NEW_BINUTILS=${NEW_BINUTILS} PIE_DEFAULT=${PIE_DEFAULT} \
+ PIE_DEFAULT=${PIE_DEFAULT} \
MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- USING_NEW_BINUTILS=${NEW_BINUTILS} \
TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
${MAKE} -f Makefile.bsd-wrapper install)
-.if ${NEW_BINUTILS:L} != "yes"
- (cd ${.CURDIR}/gnu/usr.bin/gas; \
- TARGET_MACHINE_ARCH=${TARGET_ARCH} \
- MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} depend all; \
- TARGET_MACHINE_ARCH=${TARGET_ARCH} \
- DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- ${MAKE} NOMAN= install)
- ln -sf ${CROSSDIR}/usr/bin/as \
- ${CROSSDIR}/usr/${TARGET_CANON}/bin/as
- (cd ${.CURDIR}/gnu/usr.bin/ld; \
- TARGET_MACHINE_ARCH=${TARGET_ARCH} \
- MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- ${MAKE} NOPIC= NOMAN= depend all; \
- TARGET_MACHINE_ARCH=${TARGET_ARCH} \
- DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- ${MAKE} NOPIC= NOMAN= install)
- ln -sf ${CROSSDIR}/usr/bin/ld \
- ${CROSSDIR}/usr/${TARGET_CANON}/bin/ld
- (cd ${.CURDIR}/usr.bin/ar; \
- ELF_TOOLCHAIN=no \
- MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
- ELF_TOOLCHAIN=no \
- DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- ${MAKE} NOMAN= install)
- ln -sf ${CROSSDIR}/usr/bin/ar \
- ${CROSSDIR}/usr/${TARGET_CANON}/bin/ar
- @(cd ${.CURDIR}/usr.bin/ranlib; \
- ELF_TOOLCHAIN=no \
- MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
- ELF_TOOLCHAIN=no \
- DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- ${MAKE} NOMAN= install)
- ln -sf ${CROSSDIR}/usr/bin/ranlib \
- ${CROSSDIR}/usr/${TARGET_CANON}/bin/ranlib
- (cd ${.CURDIR}/usr.bin/strip; \
- MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- ${MAKE} TARGET_MACHINE_ARCH=${TARGET_ARCH} \
- NOMAN= depend all; \
- DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- ${MAKE} TARGET_MACHINE_ARCH=${TARGET_ARCH} \
- NOMAN= install)
- ln -sf ${CROSSDIR}/usr/bin/strip \
- ${CROSSDIR}/usr/${TARGET_CANON}/bin/strip
-.endif
@for cmd in ${BINUTILS}; do \
if [ -e ${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd ] ; then \
cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd \
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index d736be96578..3b74312553d 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2011/07/10 16:24:08 deraadt Exp $
+# $OpenBSD: Makefile,v 1.41 2013/07/05 21:29:51 miod Exp $
REV= ${OSrev}
@@ -21,15 +21,9 @@ REALIMAGE!= echo /var/tmp/image.${PID}
IMAGE?= ramdisk${REV}.fs
IMAGESIZE?= 8192 # 4MB in 512 byte blocks
NEWFS_WILL_FAIL?=false
-.if ${ELF_TOOLCHAIN:L} == "yes"
RDSETROOT?= elfrdsetroot
RDSETROOT_EXT_SRC=${.CURDIR}/../common/elf32.c ${.CURDIR}/../common/elf64.c
CRUNCHGENOPTS?=-E
-.else
-RDSETROOT?= rdsetroot
-CRUNCHGENOPTS?=
-RDSETROOT_EXT_SRC=
-.endif
KERNEL?= RAMDISK
UTILS?= ${.CURDIR}/../miniroot
STRIP?= strip
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 8ac1adc1d15..a3ab6eb6e4b 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2013/03/10 21:06:23 miod Exp $
+# $OpenBSD: Makefile,v 1.53 2013/07/05 21:29:51 miod Exp $
# $NetBSD: Makefile,v 1.35 1996/04/03 21:20:52 chuck Exp $
.include <bsd.own.mk>
@@ -26,11 +26,6 @@ SUBDIR+= binutils
SUBDIR+= ${BINUTILS_VERSION}
.endif
-# most ports use binutils gas and ld, some do not (yet).
-.if ${ELF_TOOLCHAIN:L} == "no"
-SUBDIR+= gas ld
-.endif
-
# Do these last; texinfo builds the info 'dir' file, perl must be after binutils
SUBDIR+= perl texinfo
diff --git a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
index d6c37c50a1f..8174b2d47d3 100644
--- a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2013/03/10 21:07:23 miod Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.8 2013/07/05 21:29:51 miod Exp $
.include <bsd.own.mk>
@@ -23,17 +23,12 @@ MAN= binutils/doc/addr2line.1 binutils/doc/objcopy.1 \
###INST_SUBDIRS+= gdb
###MAN+= gdb/gdb.1
-.if ${ELF_TOOLCHAIN:L} == "yes"
SUBDIRS+= binutils ld gas
CONF_SUBDIRS+= binutils ld gas
INST_SUBDIRS+= binutils ld gas
MAN+= binutils/doc/ar.1 binutils/doc/ranlib.1 \
binutils/doc/strings.1 binutils/doc/strip.1 \
gas/doc/as.1 ld/ld.1
-. else
-CONF_SUBDIRS=${SUBDIRS}
-CONF_SUBDIRS+= binutils
-.endif
# Used by the GNU Makefile
ALL_MODULES=${SUBDIRS:S/^/all-/g}
@@ -64,11 +59,6 @@ all: config.status
ALL_MODULES="${ALL_MODULES}" \
ALL_HOST_MODULES='${ALL_HOST_MODULES}' \
INFO_HOST_MODULES='${INFO_HOST_MODULES}' all info
-.if ${ELF_TOOLCHAIN:L} != "yes"
- cd ${.OBJDIR}/binutils && \
- ${MAKE} CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" \
- LDFLAGS=${LDSTATIC} objdump
-.endif
.include <bsd.own.mk>
@@ -91,13 +81,11 @@ do-config: .USE
cd ${.OBJDIR} && \
${MAKE} ${CONFIGURE_MODULES}
-.if ${ELF_TOOLCHAIN:L} == "yes"
gas/doc/as.1: config.status
cd ${.OBJDIR}/gas/doc && ${MAKE} as.1
ld/ld.1: config.status
cd ${.OBJDIR}/ld && ${MAKE} ld.1
-.endif
config: do-config
.ifndef GLOBAL_AUTOCONF_CACHE
@@ -117,11 +105,6 @@ install: maninstall
INSTALL_PROGRAM='install -c -S' \
INSTALL_INFO_HOST_MODULES='${INSTALL_INFO_HOST_MODULES}' \
install install-info
-.if ${ELF_TOOLCHAIN:L} != "yes"
- cd ${.OBJDIR}/binutils && \
- ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} \
- -g ${BINGRP} -m ${BINMODE} objdump ${DESTDIR}${PREFIX}/bin
-.endif
clean cleandir:
-@if [ -e Makefile ]; then ${MAKE} distclean; fi
diff --git a/gnu/usr.bin/binutils/Makefile.bsd-wrapper b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
index 1223ec7954a..d491db9a81f 100644
--- a/gnu/usr.bin/binutils/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.81 2013/07/05 21:09:21 miod Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.82 2013/07/05 21:29:51 miod Exp $
.include <bsd.own.mk>
@@ -33,17 +33,12 @@ INST_SUBDIRS+= gdb
MAN+= gdb/gdb.1
.endif
-.if ${ELF_TOOLCHAIN:L} == "yes"
SUBDIRS+= binutils ld gas
CONF_SUBDIRS+= binutils ld gas
INST_SUBDIRS+= binutils ld gas
MAN+= binutils/doc/ar.1 binutils/doc/ranlib.1 \
binutils/doc/strings.1 binutils/doc/strip.1 \
gas/doc/as.1 ld/ld.1
-. else
-CONF_SUBDIRS=${SUBDIRS}
-CONF_SUBDIRS+= binutils
-.endif
.endif
@@ -76,11 +71,6 @@ all: config.status
ALL_MODULES="${ALL_MODULES}" \
ALL_HOST_MODULES='${ALL_HOST_MODULES}' \
INFO_HOST_MODULES='${INFO_HOST_MODULES}' all info
-.if ${ELF_TOOLCHAIN:L} != "yes"
- cd ${.OBJDIR}/binutils && \
- ${MAKE} CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" \
- LDFLAGS=${LDSTATIC} objdump
-.endif
.include <bsd.own.mk>
@@ -103,13 +93,11 @@ do-config: .USE
cd ${.OBJDIR} && \
${MAKE} ${CONFIGURE_MODULES}
-.if ${ELF_TOOLCHAIN:L} == "yes"
gas/doc/as.1: config.status
cd ${.OBJDIR}/gas/doc && ${MAKE} as.1
ld/ld.1: config.status
cd ${.OBJDIR}/ld && ${MAKE} ld.1
-.endif
config: do-config
.ifndef GLOBAL_AUTOCONF_CACHE
@@ -129,11 +117,6 @@ install: maninstall
INSTALL_PROGRAM='install -c -S' \
INSTALL_INFO_HOST_MODULES='${INSTALL_INFO_HOST_MODULES}' \
install install-info
-.if ${ELF_TOOLCHAIN:L} != "yes" && ${BINUTILS_VERSION} != "binutils-2.17"
- cd ${.OBJDIR}/binutils && \
- ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} \
- -g ${BINGRP} -m ${BINMODE} objdump ${DESTDIR}${PREFIX}/bin
-.endif
clean cleandir:
-@if [ -e Makefile ]; then ${MAKE} distclean; fi
diff --git a/gnu/usr.bin/cxxfilt/Makefile b/gnu/usr.bin/cxxfilt/Makefile
index 9ce23b85752..f30b204be60 100644
--- a/gnu/usr.bin/cxxfilt/Makefile
+++ b/gnu/usr.bin/cxxfilt/Makefile
@@ -7,22 +7,9 @@ LIBIBERTY_INCDIR=${.CURDIR}/../../lib/libiberty/include
CFLAGS+=-I${LIBIBERTY_INCDIR}
LDADD=-liberty
-underscore.c:
- @case ${ELF_TOOLCHAIN:L} in \
- "yes") v=0;; \
- *) v=1;; \
- esac; \
- c="int prepends_underscore=$$v;"; \
- echo "echo \"$$c\" >$@"; \
- echo $$c >$@
-
cxxmain.c:
ln -s ${LIBIBERTY_SRCDIR}/cplus-dem.c $@
.include <bsd.prog.mk>
-.if ${ELF_TOOLCHAIN:L} == "yes"
CFLAGS+=-DTARGET_PREPENDS_UNDERSCORE=0
-.else
-CFLAGS+=-DTARGET_PREPENDS_UNDERSCORE=1
-.endif
diff --git a/lib/libc/dlfcn/Makefile.inc b/lib/libc/dlfcn/Makefile.inc
index 3bf1bab1440..bdc09511fa8 100644
--- a/lib/libc/dlfcn/Makefile.inc
+++ b/lib/libc/dlfcn/Makefile.inc
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.2 2005/12/27 18:42:24 drahn Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2013/07/05 21:29:51 miod Exp $
.PATH: ${LIBCSRCDIR}/dlfcn
.include <bsd.own.mk>
-.if ${ELF_TOOLCHAIN:L} == "yes"
SRCS+= dlfcn_stubs.c
-.endif
diff --git a/lib/librthread/Makefile b/lib/librthread/Makefile
index 1c82668a5ea..d143e6c886f 100644
--- a/lib/librthread/Makefile
+++ b/lib/librthread/Makefile
@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.35 2013/06/17 19:11:54 guenther Exp $
+# $OpenBSD: Makefile,v 1.36 2013/07/05 21:29:51 miod Exp $
-# For ``COMPILER_VERSION'' and ``ELF_TOOLCHAIN''
+# For ``COMPILER_VERSION''
.include <bsd.own.mk>
LIB=pthread
LIBCSRCDIR= ${.CURDIR}/../libc
CFLAGS+=-Wall -g -Werror -Wshadow
-.if ${COMPILER_VERSION:L} == "gcc4" || \
- (${COMPILER_VERSION:L} == "gcc3" && ${ELF_TOOLCHAIN:L} == "yes")
+.if ${COMPILER_VERSION:L} == "gcc4" || ${COMPILER_VERSION:L} == "gcc3"
CFLAGS+=-Wmissing-prototypes
.endif
CFLAGS+=-Wstrict-prototypes
diff --git a/libexec/ld.so/Makefile b/libexec/ld.so/Makefile
index f1b3ab1433f..ae716f48ac4 100644
--- a/libexec/ld.so/Makefile
+++ b/libexec/ld.so/Makefile
@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile,v 1.44 2013/06/01 09:57:55 miod Exp $
+# $OpenBSD: Makefile,v 1.45 2013/07/05 21:29:51 miod Exp $
SUBDIR=ldconfig ldd
MAN= ld.so.1
.include <bsd.own.mk>
-.if (${ELF_TOOLCHAIN:L} == "yes")
-
.if defined(NOPIC)
NOPROG=
.else
@@ -40,6 +38,4 @@ $(PROG):
$(LD) -x -e _dl_start $(ELF_LDFLAGS) -o $(PROG) $(OBJS) $(LDADD)
.endif
-.endif
-
.include <bsd.prog.mk>
diff --git a/libexec/ld.so/ldconfig/Makefile b/libexec/ld.so/ldconfig/Makefile
index 8f46c1d5d1e..4cd40feb2b5 100644
--- a/libexec/ld.so/ldconfig/Makefile
+++ b/libexec/ld.so/ldconfig/Makefile
@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2013/03/20 21:49:59 kurt Exp $
+# $OpenBSD: Makefile,v 1.10 2013/07/05 21:29:51 miod Exp $
# $NetBSD: Makefile,v 1.10 1995/03/06 04:24:41 cgd Exp $
MAN= ldconfig.8
.include <bsd.own.mk>
-.if (${ELF_TOOLCHAIN:L} == "yes")
-
PROG= ldconfig
SRCS= ldconfig.c shlib.c etc.c prebind_delete.c debug.c prebind.c library.c sod.c prebind_path.c
LDDIR?= $(.CURDIR)/..
@@ -17,6 +15,4 @@ BINDIR= /sbin
#.PATH: $(LDDIR) $(LDDIR)/$(MACHINE_ARCH)
-.endif
-
.include <bsd.prog.mk>
diff --git a/libexec/ld.so/ldd/Makefile b/libexec/ld.so/ldd/Makefile
index 8baefbddbb5..4bb2248102f 100644
--- a/libexec/ld.so/ldd/Makefile
+++ b/libexec/ld.so/ldd/Makefile
@@ -1,16 +1,13 @@
-# $OpenBSD: Makefile,v 1.4 2013/02/17 22:06:31 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2013/07/05 21:29:51 miod Exp $
MAN= ldd.1
.include <bsd.own.mk>
-.if (${ELF_TOOLCHAIN:L} == "yes")
PROG= ldd
SRCS= ldd.c
#CFLAGS+=-Werror
BINDIR= /usr/bin
-.endif
-
.include <bsd.prog.mk>
diff --git a/regress/libexec/ld.so/link-order/Makefile b/regress/libexec/ld.so/link-order/Makefile
index e5cbcc5a7a5..11f4617339b 100644
--- a/regress/libexec/ld.so/link-order/Makefile
+++ b/regress/libexec/ld.so/link-order/Makefile
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2003/07/01 07:08:31 niklas Exp $
+# $OpenBSD: Makefile,v 1.3 2013/07/05 21:29:51 miod Exp $
.include <bsd.own.mk>
-.if (${ELF_TOOLCHAIN} == "yes")
SUBDIR+= libnover
-.endif
SUBDIR+= lib10 lib11 lib20 prog test
install:
diff --git a/regress/libexec/ld.so/link-order/test/Makefile b/regress/libexec/ld.so/link-order/test/Makefile
index 3aa3996b7d2..813820e0ac5 100644
--- a/regress/libexec/ld.so/link-order/test/Makefile
+++ b/regress/libexec/ld.so/link-order/test/Makefile
@@ -1,16 +1,13 @@
-# $OpenBSD: Makefile,v 1.6 2010/08/04 18:25:24 kettenis Exp $
+# $OpenBSD: Makefile,v 1.7 2013/07/05 21:29:51 miod Exp $
.include <bsd.own.mk>
REGRESS_TARGETS= test-none test-single test-minor-1 test-minor-2 \
test-major-1 test-major-2
-.if (${ELF_TOOLCHAIN} == "yes")
REGRESS_TARGETS+= test-nover test-nover-single-1 test-nover-single-2
-.endif
.include <bsd.obj.mk>
-.if (${ELF_TOOLCHAIN} == "yes")
DIR_NOVER=${.CURDIR}/../libnover
OBJDIR_NOVER!= if [ -d $(DIR_NOVER)/${__objdir} ]; then \
@@ -18,7 +15,6 @@ OBJDIR_NOVER!= if [ -d $(DIR_NOVER)/${__objdir} ]; then \
else \
echo "$(DIR_NOVER)"; \
fi
-.endif
DIR_10=${.CURDIR}/../lib10
@@ -66,11 +62,9 @@ clean:
test-none: make-lib clean
sh ${.CURDIR}/test.sh ${PROGPATH} '%ERROR%'
-.if (${ELF_TOOLCHAIN} == "yes")
test-nover: make-lib clean
cp ${OBJDIR_NOVER}/libtest.so lib/
sh ${.CURDIR}/test.sh ${PROGPATH} none
-.endif
test-single: make-lib clean
cp ${OBJDIR_10}/libtest.so.1.0 lib/
@@ -92,7 +86,6 @@ test-major-2: make-lib clean
cp ${OBJDIR_11}/libtest.so.1.1 ${OBJDIR_20}/libtest.so.2.0 lib/
sh ${.CURDIR}/test.sh ${PROGPATH} 2.0
-.if (${ELF_TOOLCHAIN} == "yes")
test-nover-single-1: make-lib clean
cp ${OBJDIR_NOVER}/libtest.so ${OBJDIR_10}/libtest.so.1.0 lib/
sh ${.CURDIR}/test.sh ${PROGPATH} none
@@ -100,6 +93,5 @@ test-nover-single-1: make-lib clean
test-nover-single-2: make-lib clean
cp ${OBJDIR_10}/libtest.so.1.0 ${OBJDIR_NOVER}/libtest.so lib/
sh ${.CURDIR}/test.sh ${PROGPATH} none
-.endif
.include <bsd.regress.mk>
diff --git a/sbin/modload/Makefile b/sbin/modload/Makefile
index 17f271c7c27..5c83f4572f2 100644
--- a/sbin/modload/Makefile
+++ b/sbin/modload/Makefile
@@ -1,17 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2002/01/08 21:28:38 ericj Exp $
+# $OpenBSD: Makefile,v 1.5 2013/07/05 21:29:51 miod Exp $
PROG= modload
MAN= modload.8
SRCS= modload.c
-
-.include <bsd.own.mk> # for ELF_TOOLCHAIN
-
-.if (${ELF_TOOLCHAIN:L} == "yes")
SRCS+= elf.c
-.else
-SRCS+= a.out.c
-CFLAGS+= -DUSE_AOUT
-.endif
.include <bsd.prog.mk>
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index edefa0c0b39..6cb459ab151 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.prog.mk,v 1.57 2013/03/18 10:51:35 mpi Exp $
+# $OpenBSD: bsd.prog.mk,v 1.58 2013/07/05 21:29:51 miod Exp $
# $NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $
# @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
@@ -23,10 +23,8 @@ CXXFLAGS+= ${CXXDIAGFLAGS}
CFLAGS+= ${COPTS}
CXXFLAGS+= ${CXXOPTS}
-.if ${ELF_TOOLCHAIN:L} == "yes"
CRTBEGIN?= ${DESTDIR}/usr/lib/crtbegin.o
CRTEND?= ${DESTDIR}/usr/lib/crtend.o
-.endif
LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o
LIBASN1?= ${DESTDIR}/usr/lib/libasn1.a
diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index d605cafea12..8c68dc46cb0 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -1,16 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2005/09/19 13:01:26 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2013/07/05 21:29:51 miod Exp $
.include <bsd.own.mk>
-.if (${ELF_TOOLCHAIN:L} == "no")
-PROG= ar
-CFLAGS+=-I${.CURDIR}
-SRCS= append.c ar.c archive.c contents.c delete.c extract.c misc.c \
- move.c print.c replace.c
-MAN= ar.1
-.else
NOPROG=
-.endif
MAN+= ar.5
diff --git a/usr.bin/gprof/Makefile b/usr.bin/gprof/Makefile
index 5b91d5e320b..77760bd9a25 100644
--- a/usr.bin/gprof/Makefile
+++ b/usr.bin/gprof/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/10/17 22:54:37 schwarze Exp $
+# $OpenBSD: Makefile,v 1.20 2013/07/05 21:29:51 miod Exp $
.include <bsd.own.mk>
@@ -10,12 +10,7 @@ SRCS= gprof.c arcs.c dfn.c lookup.c ${TARGET_MACHINE_CPU}.c hertz.c \
printgprof.c printlist.c
CFLAGS+= -I. -DMD_INCLUDE=\"${TARGET_MACHINE_CPU}.h\"
-# XXX - need support for multiple archs.
-.if (${ELF_TOOLCHAIN:L} == "yes")
SRCS+=elf.c
-.else
-SRCS+=aout.c
-.endif
beforeinstall:
${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
diff --git a/usr.bin/ranlib/Makefile b/usr.bin/ranlib/Makefile
index 2cc07f10dea..04d7c95aea6 100644
--- a/usr.bin/ranlib/Makefile
+++ b/usr.bin/ranlib/Makefile
@@ -1,16 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2005/09/19 13:01:26 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2013/07/05 21:29:51 miod Exp $
.include <bsd.own.mk>
-.if (${ELF_TOOLCHAIN:L} == "no")
-PROG= ranlib
-SRCS= archive.c build.c misc.c ranlib.c touch.c
-CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../ar -I${.CURDIR}/../nm
-MAN= ranlib.1
-VPATH= ${.CURDIR}/../ar
-.else
NOPROG=
-.endif
MAN+= ranlib.5
diff --git a/usr.bin/rdist/Makefile b/usr.bin/rdist/Makefile
index 94e53be7a8c..d1c4d4ae270 100644
--- a/usr.bin/rdist/Makefile
+++ b/usr.bin/rdist/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2012/11/12 01:14:41 guenther Exp $
+# $OpenBSD: Makefile,v 1.17 2013/07/05 21:29:51 miod Exp $
PROG= rdist
@@ -10,8 +10,6 @@ WARNINGS=yes
.include <bsd.prog.mk>
-.if ${ELF_TOOLCHAIN:L} == "yes"
CFLAGS+=-DEXE_TYPE=EXE_ELF
-.endif
.depend: gram.c
diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile
index 5f43396e0dd..cc69f9218cb 100644
--- a/usr.sbin/config/Makefile
+++ b/usr.sbin/config/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2006/10/30 20:25:48 otto Exp $
+# $OpenBSD: Makefile,v 1.15 2013/07/05 21:29:51 miod Exp $
.include <bsd.own.mk>
@@ -6,13 +6,8 @@ PROG= config
SRCS= files.c gram.y hash.c main.c mkheaders.c mkioconf.c mkmakefile.c \
mkswap.c pack.c scan.l sem.c util.c \
ukc.c misc.c ukcutil.c cmd.c exec.c
-.if (${ELF_TOOLCHAIN:L} == "yes")
CFLAGS+=-DELF_SUPPORT
SRCS+= exec_elf.c
-.else
-CFLAGS+=-DAOUT_SUPPORT
-SRCS+= exec_aout.c
-.endif
CFLAGS+=-I${.CURDIR} -I.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 22:12:33 +0000