DEBUGLIBS has been broken since the gcc4 switch, so delete it. CFLAGS

contains -g by default anyway

problem noted by Edgar Pettijohn (edgar (at) pettijohn-web.com)
ok millert@ kettenis@ deraadt@

15 files changed, 18 insertions, 118 deletions

diff --git a/gnu/lib/libobjc/Makefile.bsd-wrapper b/gnu/lib/libobjc/Makefile.bsd-wrapper
index 2c2ec019358..3be984741a1 100644
--- a/gnu/lib/libobjc/Makefile.bsd-wrapper
+++ b/gnu/lib/libobjc/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.8 2013/08/06 19:11:53 miod Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.9 2016/07/04 18:01:44 guenther Exp $
 
 LIB=		objc
 
@@ -59,7 +59,7 @@ includes:
 depend: 
 	cd ${GCCDIR} && exec ${MAKE} -f Makefile.bsd-wrapper config.status target_path tconfig.h
 
-sendmsg.o sendmsg.go sendmsg.po sendmsg.so: runtime-info.h
+sendmsg.o sendmsg.po sendmsg.so: runtime-info.h
 
 runtime-info.h:
 		echo "" > tmp-runtime
@@ -113,12 +113,6 @@ gc.o: gc.c
 	@${COMPILE.c} ${.ALLSRC}  -o ${.TARGET}.o
 	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
-	
-gc.go: gc.c
-	@echo "${COMPILE.c} -g ${.ALLSRC} -o ${.TARGET}"
-	@${COMPILE.c} -g ${.ALLSRC} -o ${.TARGET}.o
-	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
 
 gc.po: gc.c
 	@echo "${COMPILE.c} -p ${.ALLSRC} -o ${.TARGET}"
@@ -138,12 +132,6 @@ gc.so: gc.c
 	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
 
-.m.go:
-	@echo "${COMPILE.m} -g ${.IMPSRC} -o ${.TARGET}"
-	@${COMPILE.m} -g ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-
 .m.po:
 	@echo "${COMPILE.m} -p ${.IMPSRC} -o ${.TARGET}"
 	@${COMPILE.m} -p ${.IMPSRC} -o ${.TARGET}.o
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 3d0282634cb..01653303a27 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.145 2016/05/30 21:35:08 guenther Exp $
+#	$OpenBSD: Makefile.inc,v 1.146 2016/07/04 18:01:44 guenther Exp $
 #	$NetBSD: Makefile.inc,v 1.35 1995/10/16 23:49:07 jtc Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/17/93
 
@@ -80,7 +80,6 @@ SRCS+=	${SRCS_${MACHINE_CPU}}
 ASM:=	${ASM:N${i:R}.o}
 .endfor
 
-GASM=	${ASM:.o=.go}
 PASM=	${ASM:.o=.po}
 SASM=	${ASM:.o=.so}
 DASM=	${ASM:.o=.do}
@@ -93,13 +92,11 @@ ASM_NOERR=__get_tcb.o __set_tcb.o __threxit.o __thrsleep.o __thrwakeup.o \
 	issetugid.o \
 	sched_yield.o sync.o \
 	umask.o 
-GASM_NOERR=	${ASM_NOERR:.o=.go}
 PASM_NOERR=	${ASM_NOERR:.o=.po}
 SASM_NOERR=	${ASM_NOERR:.o=.so}
 DASM_NOERR=	${ASM_NOERR:.o=.do}
 
 PSEUDO=
-GPSEUDO=${PSEUDO:.o=.go}
 PPSEUDO=${PSEUDO:.o=.po}
 SPSEUDO=${PSEUDO:.o=.so}
 DPSEUDO=${PSEUDO:.o=.do}
@@ -107,13 +104,11 @@ DPSEUDO=${PSEUDO:.o=.do}
 # syscalls that CANNOT FAIL and whose function has one more leading underbar
 # than its matching SYS_* symbol.  E.g., _exit() --> SYS_exit
 PSEUDO_NOERR=	_exit.o
-GPSEUDO_NOERR=${PSEUDO_NOERR:.o=.go}
 PPSEUDO_NOERR=${PSEUDO_NOERR:.o=.po}
 SPSEUDO_NOERR=${PSEUDO_NOERR:.o=.so}
 DPSEUDO_NOERR=${PSEUDO_NOERR:.o=.do}
 
 HIDDEN= ___getcwd.o fork.o sigaction.o _ptrace.o ${CANCEL:=.o}
-GHIDDEN=${HIDDEN:.o=.go}
 PHIDDEN=${HIDDEN:.o=.po}
 SHIDDEN=${HIDDEN:.o=.so}
 DHIDDEN=${HIDDEN:.o=.do}
@@ -146,38 +141,32 @@ GENERATE.rsyscall_hidden=\
 
 # ...and one of these to control how it's compiled
 FINISH=	${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} -x assembler-with-cpp -
-FINISH.go=${FINISH} -o ${.TARGET}.o			&& ${TRIM.debug}
 FINISH.po=${FINISH} -o ${.TARGET}.o -DPROF		&& ${TRIM.debug}
 FINISH.so=${FINISH} -o ${.TARGET}   ${PICFLAG}
 FINISH.do=${FINISH} -o ${.TARGET}.o ${DIST_CFLAGS}	&& ${TRIM}
 FINISH.o =${FINISH} -o ${.TARGET}.o			&& ${TRIM}
 
 # Use those to generate the desired syscall stubs
-${GASM}: ${SYS_DEP} ; @${GENERATE.rsyscall} | ${FINISH.go}
 ${PASM}: ${SYS_DEP} ; @${GENERATE.rsyscall} | ${FINISH.po}
 ${SASM}: ${SYS_DEP} ; @${GENERATE.rsyscall} | ${FINISH.so}
 ${DASM}: ${SYS_DEP} ; @${GENERATE.rsyscall} | ${FINISH.do}
 ${ASM}:  ${SYS_DEP} ; @${GENERATE.rsyscall} | ${FINISH.o}
 
-${GASM_NOERR}: ${SYS_DEP} ; @${GENERATE.rsyscall_noerr} | ${FINISH.go}
 ${PASM_NOERR}: ${SYS_DEP} ; @${GENERATE.rsyscall_noerr} | ${FINISH.po}
 ${SASM_NOERR}: ${SYS_DEP} ; @${GENERATE.rsyscall_noerr} | ${FINISH.so}
 ${DASM_NOERR}: ${SYS_DEP} ; @${GENERATE.rsyscall_noerr} | ${FINISH.do}
 ${ASM_NOERR}:  ${SYS_DEP} ; @${GENERATE.rsyscall_noerr} | ${FINISH.o}
 
-${GPSEUDO}: ${SYS_DEP} ; @${GENERATE.pseudo} | ${FINISH.go}
 ${PPSEUDO}: ${SYS_DEP} ; @${GENERATE.pseudo} | ${FINISH.po}
 ${SPSEUDO}: ${SYS_DEP} ; @${GENERATE.pseudo} | ${FINISH.so}
 ${DPSEUDO}: ${SYS_DEP} ; @${GENERATE.pseudo} | ${FINISH.do}
 ${PSEUDO}:  ${SYS_DEP} ; @${GENERATE.pseudo} | ${FINISH.o}
 
-${GPSEUDO_NOERR}: ${SYS_DEP} ; @${GENERATE.pseudo_noerr} | ${FINISH.go}
 ${PPSEUDO_NOERR}: ${SYS_DEP} ; @${GENERATE.pseudo_noerr} | ${FINISH.po}
 ${SPSEUDO_NOERR}: ${SYS_DEP} ; @${GENERATE.pseudo_noerr} | ${FINISH.so}
 ${DPSEUDO_NOERR}: ${SYS_DEP} ; @${GENERATE.pseudo_noerr} | ${FINISH.do}
 ${PSEUDO_NOERR}:  ${SYS_DEP} ; @${GENERATE.pseudo_noerr} | ${FINISH.o}
 
-${GHIDDEN}: ${SYS_DEP} ; @${GENERATE.rsyscall_hidden} | ${FINISH.go}
 ${PHIDDEN}: ${SYS_DEP} ; @${GENERATE.rsyscall_hidden} | ${FINISH.po}
 ${SHIDDEN}: ${SYS_DEP} ; @${GENERATE.rsyscall_hidden} | ${FINISH.so}
 ${DHIDDEN}: ${SYS_DEP} ; @${GENERATE.rsyscall_hidden} | ${FINISH.do}
diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index 994d068232d..c739f0ec307 100644
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.68 2016/05/26 21:24:16 millert Exp $
+#	$OpenBSD: Makefile,v 1.69 2016/07/04 18:01:44 guenther Exp $
 
 # Uncomment this to enable tracing in libcurses
 #CURSESTRACE=-DTRACE
@@ -166,13 +166,6 @@ afterinstall:
 	    ln -f $$i `echo $$i | sed 's/curses/ncurses/'`; \
 	    ln -f $$i `echo $$i | sed 's/curses/ncursesw/'`; \
 	done
-.if (${DEBUGLIBS:L} == "yes")
-	-cd ${DESTDIR}${LIBDIR}/debug; \
-	    ln -f lib${LIB}.a lib`echo ${LIB} | sed 's/curses/termlib/'`.a; \
-	    ln -f lib${LIB}.a lib`echo ${LIB} | sed 's/curses/termcap/'`.a; \
-	    ln -f lib${LIB}.a lib`echo ${LIB} | sed 's/curses/ncurses/'`.a; \
-	    ln -f lib${LIB}.a lib`echo ${LIB} | sed 's/curses/ncursesw/'`.a
-.endif
 
 .include <bsd.lib.mk>
 
diff --git a/lib/libform/Makefile b/lib/libform/Makefile
index b2ad0271687..3103f4a6ca2 100644
--- a/lib/libform/Makefile
+++ b/lib/libform/Makefile
@@ -33,9 +33,5 @@ afterinstall:
 	for i in ${_LIBS}; do \
 	    ln -f $$i `echo $$i | sed 's/form/formw/'`; \
 	done
-.if (${DEBUGLIBS:L} == "yes")
-	-cd ${DESTDIR}${LIBDIR}/debug; \
-	    ln -f lib${LIB}.a lib`echo ${LIB} | sed 's/form/formw/'`.a
-.endif
 
 .include <bsd.lib.mk>
diff --git a/lib/libmenu/Makefile b/lib/libmenu/Makefile
index 22053873706..c83e30fa7b7 100644
--- a/lib/libmenu/Makefile
+++ b/lib/libmenu/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2016/03/30 06:38:42 jmc Exp $
+# $OpenBSD: Makefile,v 1.17 2016/07/04 18:01:44 guenther Exp $
 
 LIB=	menu
 SRCS=	m_attribs.c m_cursor.c m_driver.c m_format.c \
@@ -31,9 +31,5 @@ afterinstall:
 	for i in ${_LIBS}; do \
 	    ln -f $$i `echo $$i | sed 's/menu/menuw/'`; \
 	done
-.if (${DEBUGLIBS:L} == "yes")
-	-cd ${DESTDIR}${LIBDIR}/debug; \
-	    ln -f lib${LIB}.a lib`echo ${LIB} | sed 's/menu/menuw/'`.a
-.endif
 
 .include <bsd.lib.mk>
diff --git a/lib/libpanel/Makefile b/lib/libpanel/Makefile
index 4fac2ac4987..2f96f37c9c4 100644
--- a/lib/libpanel/Makefile
+++ b/lib/libpanel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2016/03/30 06:38:42 jmc Exp $
+# $OpenBSD: Makefile,v 1.12 2016/07/04 18:01:44 guenther Exp $
 
 LIB=	panel
 SRCS=	p_above.c p_below.c p_bottom.c p_delete.c p_hidden.c p_hide.c p_move.c \
@@ -20,9 +20,5 @@ afterinstall:
 	for i in ${_LIBS}; do \
 	    ln -f $$i `echo $$i | sed 's/panel/panelw/'`; \
 	done
-.if (${DEBUGLIBS:L} == "yes")
-	-cd ${DESTDIR}${LIBDIR}/debug; \
-	    ln -f lib${LIB}.a lib`echo ${LIB} | sed 's/panel/panelw/'`.a
-.endif
 
 .include <bsd.lib.mk>
diff --git a/regress/usr.bin/ssh/unittests/test_helper/Makefile b/regress/usr.bin/ssh/unittests/test_helper/Makefile
index 5b3894cbfb5..78026e6533d 100644
--- a/regress/usr.bin/ssh/unittests/test_helper/Makefile
+++ b/regress/usr.bin/ssh/unittests/test_helper/Makefile
@@ -1,9 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 2015/01/20 22:58:57 djm Exp $
+#	$OpenBSD: Makefile,v 1.3 2016/07/04 18:01:44 guenther Exp $
 
 LIB=	test_helper
 SRCS=	test_helper.c fuzz.c
 
-DEBUGLIBS= no
 NOPROFILE= yes
 NOPIC=	yes
 
diff --git a/share/man/man5/mk.conf.5 b/share/man/man5/mk.conf.5
index d6e9d2dd4cb..89869f0b302 100644
--- a/share/man/man5/mk.conf.5
+++ b/share/man/man5/mk.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mk.conf.5,v 1.31 2016/03/31 15:53:25 schwarze Exp $
+.\"	$OpenBSD: mk.conf.5,v 1.32 2016/07/04 18:01:44 guenther Exp $
 .\"
 .\" Copyright (c) 2003 Jason McIntyre
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 31 2016 $
+.Dd $Mdocdate: July 4 2016 $
 .Dt MK.CONF 5
 .Os
 .Sh NAME
@@ -170,11 +170,6 @@ Also doesn't set
 to
 .Fl s
 per default if defined.
-.It Ev DEBUGLIBS
-Create libraries with
-.Fl g
-debug information, and install them in
-.Pa /usr/lib/debug .
 .It Ev GLOBAL_AUTOCONF_CACHE
 Set to the name of a file that all cached GNU autoconf test results will be
 saved in.
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 23c2f2c3533..434fa34ad3a 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.README,v 1.64 2016/03/09 16:28:47 deraadt Exp $
+#	$OpenBSD: bsd.README,v 1.65 2016/07/04 18:01:44 guenther Exp $
 #	$NetBSD: bsd.README,v 1.17 1996/04/13 02:08:08 thorpej Exp $
 #	@(#)bsd.README	5.1 (Berkeley) 5/11/90
 
@@ -225,9 +225,6 @@ NOPIE		Do not build PIE objects or executables.
 DEBUG		Add -g to assembly, C compiler and linking passes.  Also
 		doesn't	set STRIP to -s per default if defined.
 
-DEBUGLIBS	Create libraries with -g debug information, and install
-		them in /usr/lib/debug.
-
 WARNINGS	Adds appropriate warning flags (defined in CDIAGFLAGS,
 		e.g., -Wall...) to compiles. [no]
 
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index b18a2dfb3e3..0e23e870076 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.lib.mk,v 1.76 2016/05/15 03:44:32 guenther Exp $
+#	$OpenBSD: bsd.lib.mk,v 1.77 2016/07/04 18:01:44 guenther Exp $
 #	$NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $
 #	@(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
 
@@ -26,7 +26,7 @@ SHLIB_MINOR=${minor}
 # .do used for distrib "crunchgen" object files
 # .m for objective c files.
 .SUFFIXES:
-.SUFFIXES: .out .o .go .po .so .do .S .s .c .cc .cpp .C .cxx .f .y .l .m4 .m
+.SUFFIXES: .out .o .po .so .do .S .s .c .cc .cpp .C .cxx .f .y .l .m4 .m
 
 .if defined(NOPIE)
 CFLAGS+=	${NOPIE_FLAGS}
@@ -42,12 +42,6 @@ DIST_CFLAGS+=	-Os
 	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
 
-.c.go:
-	@echo "${COMPILE.c} -g ${.IMPSRC} -o ${.TARGET}"
-	@${COMPILE.c} -g ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-
 .c.po:
 	@echo "${COMPILE.c} -p ${.IMPSRC} -o ${.TARGET}"
 	@${COMPILE.c} -p ${.IMPSRC} -o ${.TARGET}.o
@@ -72,12 +66,6 @@ DIST_CFLAGS+=	-Os
 	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
 
-.cc.go .cpp.go .C.go .cxx.go:
-	@echo "${COMPILE.cc} -g ${.IMPSRC} -o ${.TARGET}"
-	@${COMPILE.cc} -g ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-
 .cc.po .cpp.po .C.po .cxx.po:
 	@echo "${COMPILE.cc} -p ${.IMPSRC} -o ${.TARGET}"
 	@${COMPILE.cc} -p ${.IMPSRC} -o ${.TARGET}.o
@@ -97,12 +85,6 @@ DIST_CFLAGS+=	-Os
 	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
 
-.f.go:
-	@echo "${COMPILE.f} -g ${.IMPSRC} -o ${.TARGET}"
-	@${COMPILE.f} -g ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-
 .f.po:
 	@echo "${COMPILE.f} -p ${.IMPSRC} -o ${.TARGET}"
 	@${COMPILE.f} -p ${.IMPSRC} -o ${.TARGET}.o
@@ -121,12 +103,6 @@ DIST_CFLAGS+=	-Os
 	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
 
-.S.go .s.go:
-	@echo "${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}"
-	@${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-
 .S.po .s.po:
 	@echo "${COMPILE.S} -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} \
 	    -o ${.TARGET}"
@@ -161,9 +137,6 @@ CXXFLAGS+=	${CXXOPTS}
 DEBUG?=	-g
 
 _LIBS=lib${LIB}.a
-.if (${DEBUGLIBS:L} == "yes")
-_LIBS+=lib${LIB}_g.a
-.endif
 .if !defined(NOPROFILE)
 _LIBS+=lib${LIB}_p.a
 .endif
@@ -199,13 +172,6 @@ lib${LIB}.a: ${OBJS}
 	@${AR} cq lib${LIB}.a `${LORDER} ${OBJS} | tsort -q`
 	${RANLIB} lib${LIB}.a
 
-GOBJS+=	${OBJS:.o=.go}
-lib${LIB}_g.a: ${GOBJS}
-	@echo building debugging ${LIB} library
-	@rm -f lib${LIB}_g.a
-	@${AR} cq lib${LIB}_g.a `${LORDER} ${GOBJS} | tsort -q`
-	${RANLIB} lib${LIB}_g.a
-
 POBJS+=	${OBJS:.o=.po}
 lib${LIB}_p.a: ${POBJS}
 	@echo building profiled ${LIB} library
@@ -266,7 +232,7 @@ afterdepend: .depend
 		echo "$$0: cannot create temp file, exiting..."; \
 		exit 1; \
 	fi; \
-	sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.go \1.po \1.so \1.do:/' \
+	sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.po \1.so \1.do:/' \
 	      < .depend > $$TMP; \
 	mv $$TMP .depend)
 .endif
@@ -284,15 +250,6 @@ realinstall:
 	${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}.a
 .endif
 	chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}.a
-.if (${DEBUGLIBS:L} == "yes")
-#	ranlib lib${LIB}_g.a
-	${INSTALL} ${INSTALL_COPY} -S -o ${LIBOWN} -g ${LIBGRP} -m 600 \
-	    lib${LIB}_g.a ${DESTDIR}${LIBDIR}/debug/lib${LIB}.a
-.if (${INSTALL_COPY} != "-p")
-	${RANLIB} -t ${DESTDIR}${LIBDIR}/debug/lib${LIB}.a
-.endif
-	chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/debug/lib${LIB}.a
-.endif
 .if !defined(NOPROFILE)
 #	ranlib lib${LIB}_p.a
 	${INSTALL} ${INSTALL_COPY} -S -o ${LIBOWN} -g ${LIBGRP} -m 600 \
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index a875eefaee5..de15703bbec 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.own.mk,v 1.174 2016/07/04 17:56:54 guenther Exp $
+#	$OpenBSD: bsd.own.mk,v 1.175 2016/07/04 18:01:44 guenther Exp $
 #	$NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
 
 # Host-specific overrides
@@ -14,8 +14,6 @@ WARNINGS?=	no
 SKEY?=		yes
 # Set `YP' to `yes' to build with support for NIS/YP.
 YP?=		yes
-# Set `DEBUGLIBS' to `yes' to build libraries with debugging symbols
-DEBUGLIBS?=	no
 
 GCC3_ARCH=m88k
 
diff --git a/sys/arch/amd64/stand/Makefile.inc b/sys/arch/amd64/stand/Makefile.inc
index 4460cf4bdaf..9ed0d8b10d2 100644
--- a/sys/arch/amd64/stand/Makefile.inc
+++ b/sys/arch/amd64/stand/Makefile.inc
@@ -1,10 +1,9 @@
-#	$OpenBSD: Makefile.inc,v 1.13 2015/10/08 22:41:12 yasuoka Exp $
+#	$OpenBSD: Makefile.inc,v 1.14 2016/07/04 18:01:44 guenther Exp $
 
 CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror
 CFLAGS+=	-fno-stack-protector -DMDRANDOM
 CPPFLAGS+=-I${S} -I${SADIR}/libsa -I. -I${.CURDIR}
 SACFLAGS=-D_STANDALONE
-DEBUGLIBS=no
 DEBUGFLAGS=
 # DEBUGFLAGS+=-DDEBUG
 # DEBUGFLAGS+=-DGIDT_DEBUG
diff --git a/sys/arch/hppa/stand/Makefile.inc b/sys/arch/hppa/stand/Makefile.inc
index 04551292705..d4a1e6a46f5 100644
--- a/sys/arch/hppa/stand/Makefile.inc
+++ b/sys/arch/hppa/stand/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.19 2012/08/31 16:13:20 pascal Exp $
+#	$OpenBSD: Makefile.inc,v 1.20 2016/07/04 18:01:44 guenther Exp $
 
 CFLAGS=${DEBUG} -Os -Wall -Werror
 CPPFLAGS+=-I${S} -I. -I${.CURDIR}
@@ -14,7 +14,6 @@ LINKADDR=0xf80000
 LOADADDR=0xf80000
 HEAP_LIMIT=0xff8000
 CLEANFILES+=	machine
-DEBUGLIBS=	no
 
 .if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj) && !(defined(PROG) && ${PROG} == "mkboot")
 .BEGIN:
diff --git a/sys/arch/i386/stand/Makefile.inc b/sys/arch/i386/stand/Makefile.inc
index a36faef6bdc..60d6d44ca55 100644
--- a/sys/arch/i386/stand/Makefile.inc
+++ b/sys/arch/i386/stand/Makefile.inc
@@ -1,10 +1,9 @@
-#	$OpenBSD: Makefile.inc,v 1.47 2015/10/08 22:41:12 yasuoka Exp $
+#	$OpenBSD: Makefile.inc,v 1.48 2016/07/04 18:01:44 guenther Exp $
 
 CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror
 CFLAGS+=	-fno-stack-protector -DMDRANDOM
 CPPFLAGS+=-I${S} -I${SADIR}/libsa -I. -I${.CURDIR}
 SACFLAGS=-D_STANDALONE
-DEBUGLIBS=no
 DEBUGFLAGS=
 # DEBUGFLAGS+=-DDEBUG
 # DEBUGFLAGS+=-DGIDT_DEBUG
diff --git a/usr.bin/ssh/lib/Makefile b/usr.bin/ssh/lib/Makefile
index a5034ad6a48..2c85d528b8f 100644
--- a/usr.bin/ssh/lib/Makefile
+++ b/usr.bin/ssh/lib/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.85 2016/05/25 23:48:45 schwarze Exp $
+#	$OpenBSD: Makefile,v 1.86 2016/07/04 18:01:44 guenther Exp $
 
 .PATH:		${.CURDIR}/..
 .include "${.CURDIR}/../Makefile.inc"
@@ -64,7 +64,6 @@ umac128.c: umac.c Makefile
 	    -e s/umac_delete/umac128_delete/g \
 	    < ${.CURDIR}/../umac.c > ${.TARGET}
 
-DEBUGLIBS= no
 NOPROFILE= yes
 NOPIC=	yes