Remove workarounds for ld reaching MAXDSIZ on vax, now that MAXDSIZ is

more comfortable.
Reminded by brad@

13 files changed, 13 insertions, 55 deletions

diff --git a/gnu/usr.bin/cvs/Makefile.bsd-wrapper b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
index 25f3a1038e4..aec81f983aa 100644
--- a/gnu/usr.bin/cvs/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.49 2013/11/11 22:58:53 deraadt Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.50 2014/04/15 20:55:42 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -21,9 +21,6 @@ KRB5=
 # .endif
 
 LDFLAGS=${LDSTATIC}
-.if ${MACHINE} == "vax"
-LDFLAGS+=-Wl,--no-keep-memory
-.endif
 
 all:	config.status
 	${MAKE} ${GNUCFLAGS} LDFLAGS="${LDFLAGS}" all info
diff --git a/gnu/usr.bin/lynx/Makefile.bsd-wrapper b/gnu/usr.bin/lynx/Makefile.bsd-wrapper
index e1fd59bcf8b..d61e3dc4d16 100644
--- a/gnu/usr.bin/lynx/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/lynx/Makefile.bsd-wrapper
@@ -1,13 +1,9 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.23 2013/08/06 19:05:57 miod Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.24 2014/04/15 20:55:42 miod Exp $
 
 MAN=	lynx.1
 CLEANFILES+= lynx.1
 DPADD=	${LIBSSL} ${LIBCRYPTO}
 
-.if (${MACHINE} == "vax")
-LDFLAGS+=	-Wl,--no-keep-memory
-.endif
-
 GNUCFLAGS=	CC="${CC}" CFLAGS="${CFLAGS} ${COPTS} ${OPT}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS= --with-ssl=/usr --enable-widec --enable-ipv6 --enable-debug
 HTMLDIR=	/usr/share/doc/html
diff --git a/gnu/usr.sbin/sendmail/sendmail/Makefile b/gnu/usr.sbin/sendmail/sendmail/Makefile
index 2a4f9809838..afe7a3941ad 100644
--- a/gnu/usr.sbin/sendmail/sendmail/Makefile
+++ b/gnu/usr.sbin/sendmail/sendmail/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.31 2014/04/13 08:35:27 brad Exp $
+#	$OpenBSD: Makefile,v 1.32 2014/04/15 20:55:42 miod Exp $
 
 PROG=	sendmail
 
@@ -20,10 +20,6 @@ LDADD+= -lsasl2
 LDFLAGS+=-L/usr/local/lib
 .endif
 
-.if ${MACHINE} == "vax"
-LDFLAGS+=-Wl,--no-keep-memory
-.endif
-
 # Compile with milter support.
 ENVDEF+= -DMILTER
 
diff --git a/kerberosV/Makefile.inc b/kerberosV/Makefile.inc
index a227403fd38..645be699b9a 100644
--- a/kerberosV/Makefile.inc
+++ b/kerberosV/Makefile.inc
@@ -1,13 +1,10 @@
-# $OpenBSD: Makefile.inc,v 1.21 2013/08/06 19:05:57 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.22 2014/04/15 20:55:42 miod Exp $
 
 KRB5DIR=	${.CURDIR}/../../../kerberosV/src
 KRB5SUBST=	${KRB5DIR}/../varsub
 
 CPPFLAGS+=	-DHAVE_CONFIG_H -DNO_NTLM
 CPPFLAGS+=	-I${.CURDIR}/../../include -I/usr/include/kerberosV
-.if ${MACHINE} == "vax"
-LDFLAGS+=	-Wl,--no-keep-memory
-.endif
 
 LIBHEIMIPCC=	${.OBJDIR}/../../lib/libheimipcc/libheimipcc.a
 LIBHEIMIPCS=	${.OBJDIR}/../../lib/libheimipcs/libheimipcs.a
diff --git a/libexec/login_krb5-or-pwd/Makefile b/libexec/login_krb5-or-pwd/Makefile
index b65e83df7d7..a20b0ef916d 100644
--- a/libexec/login_krb5-or-pwd/Makefile
+++ b/libexec/login_krb5-or-pwd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.17 2013/08/06 19:05:57 miod Exp $
+#	$OpenBSD: Makefile,v 1.18 2014/04/15 20:55:42 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -14,9 +14,6 @@ LDADD+=	-lkrb5 -lasn1 -lcrypto -lutil
 LDADD+=	-lwind -lroken -lcom_err -lheimbase
 CFLAGS+=-DKRB5
 .PATH:	${.CURDIR}/../login_passwd ${.CURDIR}/../login_krb5 ${.CURDIR}/../../usr.bin/passwd
-.if ${MACHINE} == "vax"
-LDFLAGS+=-Wl,--no-keep-memory
-.endif
 .else
 DPADD+=  ${LIBUTIL}
 LDADD+=  -lutil
diff --git a/libexec/login_krb5/Makefile b/libexec/login_krb5/Makefile
index 57676948dd7..7e0b9966a06 100644
--- a/libexec/login_krb5/Makefile
+++ b/libexec/login_krb5/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.20 2013/08/06 19:05:57 miod Exp $
+#	$OpenBSD: Makefile,v 1.21 2014/04/15 20:55:42 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -14,9 +14,6 @@ DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
 LDADD+=	-lkrb5 -lasn1 -lcrypto
 LDADD+= -lwind -lroken -lcom_err -lheimbase
 CFLAGS+=-DKRB5
-.if ${MACHINE} == "vax"
-LDFLAGS+=-Wl,--no-keep-memory
-.endif
 .endif
 
 DPADD+=	${LIBUTIL}
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index e44581d76c6..1cdc9779fcf 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.36 2013/08/06 19:05:57 miod Exp $
+#	$OpenBSD: Makefile,v 1.37 2014/04/15 20:55:42 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -23,9 +23,6 @@ CFLAGS+= -DKRB5
 DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
 LDADD+=	-lkrb5 -lasn1 -lcrypto
 LDADD+= -lwind -lroken -lcom_err -lheimbase
-.if ${MACHINE} == "vax"
-LDFLAGS+=-Wl,--no-keep-memory
-.endif
 .endif
 
 BINMODE=4555
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index b0df5b796d1..a3f1d4a7a7f 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.28 2013/08/06 19:05:57 miod Exp $
+#	$OpenBSD: Makefile,v 1.29 2014/04/15 20:55:42 miod Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -49,9 +49,6 @@ DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
 LDADD+= -lkrb5 -lasn1 -lcrypto
 LDADD+= -lwind -lroken -lcom_err -lheimbase
 SRCS+= kerberos5.c enc_des.c
-.if ${MACHINE} == "vax"
-LDFLAGS+=-Wl,--no-keep-memory
-.endif
 .endif
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper
index 62d7849e4a2..f14709266c7 100644
--- a/usr.sbin/httpd/Makefile.bsd-wrapper
+++ b/usr.sbin/httpd/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
 # Build wrapper for Apache 
-# $OpenBSD: Makefile.bsd-wrapper,v 1.73 2013/08/06 19:05:57 miod Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.74 2014/04/15 20:55:42 miod Exp $
 
 # Our lndir is hacked; specify a full path to avoid potential conflicts
 # with the one installed with X11.
@@ -634,9 +634,6 @@ all: 	${.OBJDIR}/config.status
 BEFOREMAN=${.OBJDIR}/config.status
 
 EXTRA_LDFLAGS=-lpthread
-.if ${MACHINE} == "vax"
-EXTRA_LDFLAGS+=-Wl,--no-keep-memory
-.endif
 
 ${.OBJDIR}/config.status : ${.OBJDIR}/config.layout 
 	@cd ${.OBJDIR} && CC="${CC}" LD_SHLIB="${CC}" \
diff --git a/usr.sbin/ldapd/Makefile b/usr.sbin/ldapd/Makefile
index 9774aeccde9..d285f1a5e79 100644
--- a/usr.sbin/ldapd/Makefile
+++ b/usr.sbin/ldapd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2013/08/06 19:05:57 miod Exp $
+#	$OpenBSD: Makefile,v 1.11 2014/04/15 20:55:42 miod Exp $
 
 PROG=		ldapd
 MAN=		ldapd.8 ldapd.conf.5
@@ -17,10 +17,6 @@ CFLAGS+=	-Wshadow -Wpointer-arith -Wcast-qual
 CFLAGS+=	-Wsign-compare
 CLEANFILES+=	y.tab.h parse.c
 
-.if ${MACHINE} == "vax"
-LDFLAGS+=-Wl,--no-keep-memory
-.endif
-
 SCHEMA_FILES=	core.schema \
 		inetorgperson.schema \
 		nis.schema
diff --git a/usr.sbin/nginx/Makefile.bsd-wrapper b/usr.sbin/nginx/Makefile.bsd-wrapper
index 4e49308bb09..7c42d03f984 100644
--- a/usr.sbin/nginx/Makefile.bsd-wrapper
+++ b/usr.sbin/nginx/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
 # Build wrapper for Nginx
-# $OpenBSD: Makefile.bsd-wrapper,v 1.14 2013/11/04 14:09:19 florian Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.15 2014/04/15 20:55:42 miod Exp $
 
 LNDIR=	/usr/bin/lndir
 
@@ -7,7 +7,6 @@ LNDIR=	/usr/bin/lndir
 
 .if (${MACHINE_ARCH} == "vax")
 CFLAGS=-O1 ${PIPE} ${DEBUG}
-CORE_LINK=-Wl,--no-keep-memory
 .endif
 
 CONFIGURE_ARGS=	--prefix=/var/www \
diff --git a/usr.sbin/openssl/Makefile b/usr.sbin/openssl/Makefile
index 4e0b688e1fd..e37f9aee41b 100644
--- a/usr.sbin/openssl/Makefile
+++ b/usr.sbin/openssl/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.22 2013/08/06 19:05:57 miod Exp $
+#	$OpenBSD: Makefile,v 1.23 2014/04/15 20:55:42 miod Exp $
 
 PROG=	openssl
 LDADD=	-lssl -lcrypto
@@ -13,10 +13,6 @@ CFLAGS+= -DMONOLITH -DTERMIOS -DANSI_SOURCE -DOPENSSL_NO_RC5
 CFLAGS+= -DOPENSSL_NO_SSL2
 CFLAGS+= -I${SSLEAY_SRC_TOP}
 
-.if ${MACHINE} == "vax"
-LDFLAGS+=-Wl,--no-keep-memory
-.endif
-
 SRCS=	verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c \
 	pkcs7.c crl2p7.c crl.c ca.c \
 	rsa.c rsautl.c dsa.c dsaparam.c ec.c ecparam.c \
diff --git a/usr.sbin/smtpd/smtpd/Makefile b/usr.sbin/smtpd/smtpd/Makefile
index 4f6e2c6c7ec..eaea69071a7 100644
--- a/usr.sbin/smtpd/smtpd/Makefile
+++ b/usr.sbin/smtpd/smtpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.73 2014/04/09 18:55:19 eric Exp $
+#	$OpenBSD: Makefile,v 1.74 2014/04/15 20:55:42 miod Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -49,8 +49,4 @@ CFLAGS+=	-DIO_SSL
 CFLAGS+=	-DQUEUE_PROFILING
 YFLAGS=
 
-.if ${MACHINE} == "vax"
-LDFLAGS+=	-Wl,--no-keep-memory
-.endif
-
 .include <bsd.prog.mk>