summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/conf/Makefile.alpha7
-rw-r--r--sys/arch/amd64/conf/Makefile.amd646
-rw-r--r--sys/arch/armish/conf/Makefile.armish7
-rw-r--r--sys/arch/armv7/conf/Makefile.armv77
-rw-r--r--sys/arch/hppa/conf/Makefile.hppa6
-rw-r--r--sys/arch/hppa64/conf/Makefile.hppa644
-rw-r--r--sys/arch/i386/conf/Makefile.i3867
-rw-r--r--sys/arch/landisk/conf/Makefile.landisk7
-rw-r--r--sys/arch/loongson/conf/Makefile.loongson7
-rw-r--r--sys/arch/luna88k/conf/Makefile.luna88k7
-rw-r--r--sys/arch/macppc/conf/Makefile.macppc7
-rw-r--r--sys/arch/octeon/conf/Makefile.octeon6
-rw-r--r--sys/arch/sgi/conf/Makefile.sgi7
-rw-r--r--sys/arch/socppc/conf/Makefile.socppc7
-rw-r--r--sys/arch/sparc/conf/Makefile.sparc7
-rw-r--r--sys/arch/sparc64/conf/Makefile.sparc647
-rw-r--r--sys/arch/zaurus/conf/Makefile.zaurus7
17 files changed, 50 insertions, 63 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index bb707761344..d05a8be2c7e 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.alpha,v 1.87 2015/01/13 01:12:48 deraadt Exp $
+# $OpenBSD: Makefile.alpha,v 1.88 2016/04/29 12:44:52 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -77,14 +77,13 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -S -x
+LINKFLAGS+= -S
.endif
%LOAD
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index c0a84a967a7..ba470fb993d 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.amd64,v 1.66 2015/11/13 07:52:20 mlarkin Exp $
+# $OpenBSD: Makefile.amd64,v 1.67 2016/04/29 12:44:52 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -81,13 +81,13 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -S -x
+LINKFLAGS+= -S
.endif
%LOAD
diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish
index ee71cf4586e..56bcd9a1118 100644
--- a/sys/arch/armish/conf/Makefile.armish
+++ b/sys/arch/armish/conf/Makefile.armish
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.armish,v 1.51 2015/01/13 01:12:49 deraadt Exp $
+# $OpenBSD: Makefile.armish,v 1.52 2016/04/29 12:44:52 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -85,14 +85,13 @@ SYSTEM_LD_TAIL+=; \
DEBUG?=
.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -x
+LINKFLAGS+= -S
.endif
%LOAD
diff --git a/sys/arch/armv7/conf/Makefile.armv7 b/sys/arch/armv7/conf/Makefile.armv7
index 504d8227a02..a8d44d7f769 100644
--- a/sys/arch/armv7/conf/Makefile.armv7
+++ b/sys/arch/armv7/conf/Makefile.armv7
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.armv7,v 1.12 2015/06/08 06:33:16 jsg Exp $
+# $OpenBSD: Makefile.armv7,v 1.13 2016/04/29 12:44:52 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -82,14 +82,13 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -x
+LINKFLAGS+= -S
.endif
%LOAD
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index 846b4a0637e..d229f23f04d 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hppa,v 1.80 2015/01/13 01:12:49 deraadt Exp $
+# $OpenBSD: Makefile.hppa,v 1.81 2016/04/29 12:44:52 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -87,13 +87,13 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -S -x
+LINKFLAGS+= -S
.endif
%LOAD
diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64
index a93c8e01c6b..ac9cb63630c 100644
--- a/sys/arch/hppa64/conf/Makefile.hppa64
+++ b/sys/arch/hppa64/conf/Makefile.hppa64
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hppa64,v 1.52 2015/01/13 01:12:49 deraadt Exp $
+# $OpenBSD: Makefile.hppa64,v 1.53 2016/04/29 12:44:52 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -79,7 +79,7 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 4cc51dc8724..56492f6fec6 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.i386,v 1.93 2015/08/12 06:19:25 mlarkin Exp $
+# $OpenBSD: Makefile.i386,v 1.94 2016/04/29 12:44:52 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -83,14 +83,13 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -S -x
+LINKFLAGS+= -S
.endif
%LOAD
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index b1a53ac4362..3d4cc81cfff 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.landisk,v 1.53 2015/01/13 01:12:49 deraadt Exp $
+# $OpenBSD: Makefile.landisk,v 1.54 2016/04/29 12:44:52 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -76,14 +76,13 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -S -x
+LINKFLAGS+= -S
.endif
%LOAD
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index 03b5d1b0eaf..fdc41629964 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.loongson,v 1.45 2015/01/13 01:12:49 deraadt Exp $
+# $OpenBSD: Makefile.loongson,v 1.46 2016/04/29 12:44:52 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -84,14 +84,13 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -x
+LINKFLAGS+= -S
.endif
%LOAD
diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index 19ef165e769..46b516a2fb8 100644
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.luna88k,v 1.59 2015/01/13 01:12:49 deraadt Exp $
+# $OpenBSD: Makefile.luna88k,v 1.60 2016/04/29 12:44:52 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -81,14 +81,13 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -S -x
+LINKFLAGS+= -S
.endif
%LOAD
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 920012b0352..058ae367150 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.macppc,v 1.71 2015/01/13 01:12:49 deraadt Exp $
+# $OpenBSD: Makefile.macppc,v 1.72 2016/04/29 12:44:52 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -76,14 +76,13 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -S -x
+LINKFLAGS+= -S
.endif
%LOAD
diff --git a/sys/arch/octeon/conf/Makefile.octeon b/sys/arch/octeon/conf/Makefile.octeon
index 0a9c8637127..3df37abf8f1 100644
--- a/sys/arch/octeon/conf/Makefile.octeon
+++ b/sys/arch/octeon/conf/Makefile.octeon
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.octeon,v 1.21 2015/01/13 01:12:50 deraadt Exp $
+# $OpenBSD: Makefile.octeon,v 1.22 2016/04/29 12:44:52 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -85,13 +85,13 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
+LINKFLAGS+= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -x
+LINKFLAGS+= -S
.endif
%LOAD
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index a2610322dab..74ae52b0e3a 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sgi,v 1.69 2015/01/13 01:12:50 deraadt Exp $
+# $OpenBSD: Makefile.sgi,v 1.70 2016/04/29 12:44:52 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -84,14 +84,13 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -x
+LINKFLAGS+= -S
.endif
%LOAD
diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc
index b9406f4e7c4..146d45f2057 100644
--- a/sys/arch/socppc/conf/Makefile.socppc
+++ b/sys/arch/socppc/conf/Makefile.socppc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.socppc,v 1.42 2015/01/13 01:12:50 deraadt Exp $
+# $OpenBSD: Makefile.socppc,v 1.43 2016/04/29 12:44:52 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -76,14 +76,13 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -S -x
+LINKFLAGS+= -S
.endif
%LOAD
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index 62216f4b4e5..10b1e8e1e31 100644
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sparc,v 1.84 2015/01/13 01:12:50 deraadt Exp $
+# $OpenBSD: Makefile.sparc,v 1.85 2016/04/29 12:44:53 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -80,14 +80,13 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -S -x
+LINKFLAGS+= -S
.endif
%LOAD
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index 56bc973fde2..2b0ae1abe40 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sparc64,v 1.72 2015/01/13 01:12:50 deraadt Exp $
+# $OpenBSD: Makefile.sparc64,v 1.73 2016/04/29 12:44:53 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -77,14 +77,13 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -S -x
+LINKFLAGS+= -S
.endif
%LOAD
diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus
index 32500685ea1..29eb7b4dad7 100644
--- a/sys/arch/zaurus/conf/Makefile.zaurus
+++ b/sys/arch/zaurus/conf/Makefile.zaurus
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.zaurus,v 1.54 2015/01/13 01:12:50 deraadt Exp $
+# $OpenBSD: Makefile.zaurus,v 1.55 2016/04/29 12:44:53 mpi Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -81,14 +81,13 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
.if ${DEBUG} == "-g"
-LINKFLAGS+= -X
-STRIPFLAGS= -g -x
+STRIPFLAGS= -S
SYSTEM_LD_TAIL+=; \
echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
-LINKFLAGS+= -x
+LINKFLAGS+= -S
.endif
%LOAD