Remove _OPSYS_WHOLE_ARCHIVE_FLAG and _OPSYS_NO_WHOLE_ARCHIVE_FLAG, these

variables are unused and in at least one case were completely wrong anyway.

23 files changed, 22 insertions, 148 deletions

diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index c7b5cd2dffc..17c43376ac8 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.41 2016/03/04 21:25:47 tnn Exp $
+# $NetBSD: AIX.mk,v 1.42 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -48,11 +48,6 @@ _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-b -V simple -z 	# switch to patch(1) for backup suffix
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index d47931aa406..c5245977ccd 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.33 2013/04/28 12:53:56 obache Exp $
+# $NetBSD: BSDOS.mk,v 1.34 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -55,11 +55,6 @@ _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b -z	# switch to patch(1) for backup suffix
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
diff --git a/mk/platform/Bitrig.mk b/mk/platform/Bitrig.mk
index 62375ac759c..04db99d821f 100644
--- a/mk/platform/Bitrig.mk
+++ b/mk/platform/Bitrig.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Bitrig.mk,v 1.2 2015/11/07 23:46:28 sevan Exp $
+# $NetBSD: Bitrig.mk,v 1.3 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the Bitrig operating system.
 
@@ -49,11 +49,6 @@ _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -z 	# switch to patch(1) for backup suffix
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
diff --git a/mk/platform/Cygwin.mk b/mk/platform/Cygwin.mk
index c783e045ef1..c787073e1c2 100644
--- a/mk/platform/Cygwin.mk
+++ b/mk/platform/Cygwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Cygwin.mk,v 1.15 2013/10/13 10:10:05 wiz Exp $
+# $NetBSD: Cygwin.mk,v 1.16 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the Windows with Cygwin.
 
@@ -56,11 +56,6 @@ _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-b -V simple -z	# switch to patch(1) for backup suffix
 _USE_RPATH=		no	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 26726d471d1..2cd43409d8a 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.79 2016/02/29 10:05:47 jperkin Exp $
+# $NetBSD: Darwin.mk,v 1.80 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -152,16 +152,6 @@ BUILDLINK_TRANSFORM+=	rm:-Wl,--export-dynamic
 BUILDLINK_TRANSFORM+=	rm:-Wl,--gc-sections
 BUILDLINK_TRANSFORM+=	rm:-Wl,--no-undefined
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-.if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,-force-load
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	
-.else
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-.endif
-
 _OPSYS_CAN_CHECK_SHLIBS=	yes # check shared libraries using otool(1)
 
 # OSX strip(1) tries to remove relocatable symbols and fails on certain
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index b3c0a2d1d66..c53c14f5546 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.47 2015/09/10 19:49:58 jperkin Exp $
+# $NetBSD: DragonFly.mk,v 1.48 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -46,11 +46,6 @@ _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -z 	# switch to patch(1) for backup suffix
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index 9ab4ba7c765..30fa7c40a4b 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.31 2015/04/21 17:01:56 joerg Exp $
+# $NetBSD: FreeBSD.mk,v 1.32 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -52,11 +52,6 @@ _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b 	# switch to patch(1) for backup suffix
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
diff --git a/mk/platform/GNUkFreeBSD.mk b/mk/platform/GNUkFreeBSD.mk
index 919b05b4f49..66ab537a22e 100644
--- a/mk/platform/GNUkFreeBSD.mk
+++ b/mk/platform/GNUkFreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: GNUkFreeBSD.mk,v 1.3 2015/04/21 17:01:56 joerg Exp $
+# $NetBSD: GNUkFreeBSD.mk,v 1.4 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the Debian GNU/kFreeBSD operating system.
 
@@ -58,11 +58,6 @@ _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?= 	-b -V simple -z	# switch to patch(1) for backup suffix
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
diff --git a/mk/platform/HPUX.mk b/mk/platform/HPUX.mk
index ddb1f0d6c3e..7e2807b9b2c 100644
--- a/mk/platform/HPUX.mk
+++ b/mk/platform/HPUX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: HPUX.mk,v 1.25 2015/04/19 12:02:15 tnn Exp $
+# $NetBSD: HPUX.mk,v 1.26 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the HP-UX operating system.
 
@@ -50,10 +50,6 @@ _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-b -V simple -z	# switch to patch(1) for backup suffix
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,-tools2-HPUX-fixme
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,-tools3-HPUX-fixme
-
 DEFAULT_SERIAL_DEVICE?=	/dev/tty1p0
 SERIAL_DEVICES?=	/dev/tty0p0 \
 			/dev/tty1p0
diff --git a/mk/platform/Haiku.mk b/mk/platform/Haiku.mk
index a12d2fa203b..ce53a876dfc 100644
--- a/mk/platform/Haiku.mk
+++ b/mk/platform/Haiku.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Haiku.mk,v 1.13 2014/06/09 08:47:29 obache Exp $
+# $NetBSD: Haiku.mk,v 1.14 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the Haiku operating system.
 
@@ -57,11 +57,6 @@ _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?= 	-b -V simple -z	# switch to patch(1) for backup suffix
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index cb98b78ef6a..dd5648a5e21 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.42 2013/07/12 10:41:58 jperkin Exp $
+# $NetBSD: IRIX.mk,v 1.43 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -60,14 +60,6 @@ _PATCH_CAN_BACKUP=	no		# native patch(1) can make backups
 .endif
 _USE_RPATH=		yes		# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# XXX:
-# These flags are for the IRIX linker.  If GNU ld is used, these would need
-# to be set to --{no-}whole-archive.  So, ugh, let's say we only do
-# IRIX tools for the time being.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,-all
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,-none
-
 # IRIX has /usr/include/iconv.h, but it's not GNU iconv, so mark it
 # incompatible.
 _INCOMPAT_ICONV=	IRIX-*-*
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index 220952b62e0..64e0b1c81dc 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.76 2015/02/16 10:42:00 jperkin Exp $
+# $NetBSD: Interix.mk,v 1.77 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -116,11 +116,6 @@ _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-b -V simple -z	# switch to patch(1) for backup suffix
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index aad4b3aab42..74605d96893 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.64 2015/11/18 22:30:12 jperkin Exp $
+# $NetBSD: Linux.mk,v 1.65 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -96,11 +96,6 @@ _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?= 	-b -V simple -z	# switch to patch(1) for backup suffix
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
diff --git a/mk/platform/Minix.mk b/mk/platform/Minix.mk
index f64d8615a75..908587a8339 100644
--- a/mk/platform/Minix.mk
+++ b/mk/platform/Minix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Minix.mk,v 1.5 2013/04/28 12:53:56 obache Exp $
+# $NetBSD: Minix.mk,v 1.6 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the Minix operating system.
 
@@ -41,11 +41,6 @@ _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?= 	-b -V simple --suffix	# switch to patch(1) for backup suffix
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
diff --git a/mk/platform/MirBSD.mk b/mk/platform/MirBSD.mk
index 2d2d7d987df..1f62747e4ea 100644
--- a/mk/platform/MirBSD.mk
+++ b/mk/platform/MirBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: MirBSD.mk,v 1.11 2015/04/21 17:01:56 joerg Exp $
+# $NetBSD: MirBSD.mk,v 1.12 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the MirOS BSD operating system.
 
@@ -49,12 +49,6 @@ _USE_RPATH=		yes	# add rpath to LDFLAGS
 BUILDLINK_TRANSFORM+=	rm:-ldl # libdl.a is an empty static library
 BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden # at least until there is a newer gcc
 
-
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index 784ad534dab..c2666e2df37 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.45 2015/08/10 21:44:34 khorben Exp $
+# $NetBSD: NetBSD.mk,v 1.46 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -76,11 +76,6 @@ _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple --suffix # switch to patch(1) for backup suffix
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
 # for programs which use dlopen()
 # not necessary since 1.6 (shared libs are linked against libgcc_pic)
 .if !empty(OS_VERSION:M1.5*)
diff --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk
index b5ef95ffcb0..855d48a6a8e 100644
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.35 2015/04/18 22:56:19 tnn Exp $
+# $NetBSD: OSF1.mk,v 1.36 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the OSF1 operating system.
 
@@ -50,10 +50,6 @@ _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-b -V simple -z	# switch to patch(1) for backup suffix
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,-all
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,-none
-
 DEFAULT_SERIAL_DEVICE?=	/dev/tty00
 SERIAL_DEVICES?=	/dev/tty00 \
 			/dev/tty01
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index 10b6ae4a4a8..f25acb28ba8 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.39 2015/05/21 17:15:48 sevan Exp $
+# $NetBSD: OpenBSD.mk,v 1.40 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -60,11 +60,6 @@ _PATCH_BACKUP_ARG?=	-V simple -b 	# switch to patch(1) for backup suffix
 .endif
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
diff --git a/mk/platform/QNX.mk b/mk/platform/QNX.mk
index ab7be92394c..01875625b3a 100644
--- a/mk/platform/QNX.mk
+++ b/mk/platform/QNX.mk
@@ -67,11 +67,6 @@ _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b -z 	# switch to patch(1) for backup suffix
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
diff --git a/mk/platform/README b/mk/platform/README
index b69c42df99d..b69a81ad421 100644
--- a/mk/platform/README
+++ b/mk/platform/README
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.4 2014/02/14 13:11:17 obache Exp $
+$NetBSD: README,v 1.5 2016/03/10 16:58:19 jperkin Exp $
 
 These files contain platform-specific definitions that are used by the
 pkgsrc infrastructure.
@@ -91,10 +91,6 @@ TODO: Document all these variables.
 
     _USE_RPATH is "yes" to add rpath to LDFLAGS, otherwise "no"
 
-    _OPSYS_WHOLE_ARCHIVE_FLAG
-
-    _OPSYS_NO_WHOLE_ARCHIVE_FLAG
-
     LINK_ALL_LIBGCC_HACK
 
     _STRIPFLAG_CC is cc(1) option to strip.
diff --git a/mk/platform/SCO_SV.mk b/mk/platform/SCO_SV.mk
index 03168faa936..834fc42787e 100644
--- a/mk/platform/SCO_SV.mk
+++ b/mk/platform/SCO_SV.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SCO_SV.mk,v 1.1 2014/03/14 22:05:18 ryoon Exp $
+# $NetBSD: SCO_SV.mk,v 1.2 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the OpenServer 5.0.7/3.2 and 6.0.0/5.
 
@@ -44,13 +44,6 @@ _PATCH_BACKUP_ARG?= 	-b -V simple -z	# switch to patch(1) for backup suffix
 #
 _USE_RPATH=		yes		# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is the standard OpenServer 5.0.7/3.2 linker, /usr/ccs/bin/ld.
-# The use of GNU ld is not currently supported.
-# XXX is this needed for OpenServer?
-_OPSYS_WHOLE_ARCHIVE_FLAG=
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=
-
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U}	# install(1) option to strip
 
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index c8a2f393296..a6d48df338a 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.67 2015/11/16 15:59:59 jperkin Exp $
+# $NetBSD: SunOS.mk,v 1.68 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -75,12 +75,6 @@ _PATCH_CAN_BACKUP=	yes		# native patch(1) can make backups
 _PATCH_BACKUP_ARG?= 	-b -V simple -z	# switch to patch(1) for backup suffix
 _USE_RPATH=		yes		# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is the standard Solaris linker, /usr/ccs/bin/ld. The use of GNU
-# ld is not currently supported.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-z allextract
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-z defaultextract
-
 # Remove flags specific to GNU ld.
 BUILDLINK_TRANSFORM+=	rm:-Wl,--as-needed
 BUILDLINK_TRANSFORM+=	rm:-Wl,--export-dynamic
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index 746a0a3b319..f7cc85c9cc7 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.33 2013/04/28 12:53:56 obache Exp $
+# $NetBSD: UnixWare.mk,v 1.34 2016/03/10 16:58:19 jperkin Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -51,13 +51,6 @@ _PATCH_BACKUP_ARG?= 	-b -V simple -z	# switch to patch(1) for backup suffix
 #
 _USE_RPATH=		yes		# add rpath to LDFLAGS
 
-# flags passed to the linker to extract all symbols from static archives.
-# this is the standard Solaris linker, /usr/ccs/bin/ld. The use of GNU
-# ld is not currently supported.
-# XXX is this needed for UnixWare?
-_OPSYS_WHOLE_ARCHIVE_FLAG=
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=
-
 # UnixWare has /usr/include/iconv.h, but it's not GNU iconv, so mark it
 # incompatible.
 _INCOMPAT_ICONV=	UnixWare-*-*