summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2017-09-17 16:33:09 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2017-09-17 16:33:09 +0000
commit4e690416725f90b74ff5a961af7c5ef2b52206e7 (patch)
treed9616339c679e3fdf4dff58030c57ba4f06b91ef /distrib
parentbac3004eed48eaa5983be17bf72e91fdd4593f57 (diff)
Some further shrinking, but obviously not enough. Something unknown
caused bloat about a month ago (and it wasn't purely the ctf additions since those are being stripped). Maybe the compiler generates different code when stronger debugging information is requested?
Diffstat (limited to 'distrib')
-rw-r--r--distrib/alpha/bsd.rd/Makefile6
-rw-r--r--distrib/alpha/common/Makefile.inc9
-rw-r--r--distrib/alpha/inst-common/Makefile.inc4
3 files changed, 9 insertions, 10 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
index 46e761ae2aa..7aa8c33bb95 100644
--- a/distrib/alpha/bsd.rd/Makefile
+++ b/distrib/alpha/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2017/08/17 05:24:09 jasper Exp $
+# $OpenBSD: Makefile,v 1.28 2017/09/17 16:33:07 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -6,7 +6,7 @@ TOP= ${.CURDIR}/..
IMAGE= ramdisk${REV}.fs
STRIP?= strip
-STRIPOPTS?= -R .SUNW_ctf
+STRIPOPTS?= -R .SUNW_ctf -R .shstrtab
GZIPCMD?= gzip
GZIPFLAGS?= -9fn
@@ -29,7 +29,7 @@ bsd.rd: bsd.rd_unz
bsd.rd_unz: bsd ${IMAGE} rdsetroot
cp bsd bsd.rd_unz
${.OBJDIR}/rdsetroot bsd.rd_unz ${IMAGE}
- strip -R .SUNW_ctf bsd.rd_unz
+ strip -R .SUNW_ctf -R .shstrtab bsd.rd_unz
bsd:
cd ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK} && \
diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index 984f3ebbd43..ada921d86fa 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.32 2017/08/17 05:24:09 jasper Exp $
+# $OpenBSD: Makefile.inc,v 1.33 2017/09/17 16:33:08 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -15,7 +15,7 @@ PID!= echo $$$$
REALIMAGE!= echo /var/tmp/image.${PID}
STRIP?= strip
-STRIPOPTS?= -R .SUNW_ctf
+STRIPOPTS?= -R .SUNW_ctf -R .shstrtab
GZIPCMD?= gzip
GZIPFLAGS?= -9fn
INSTALLBOOT?= /usr/mdec/installboot -v
@@ -64,14 +64,13 @@ ${FLOPPY}: bsd.gz
fi
bsd.gz: bsd.rd
- objcopy -Sg -R .comment bsd.rd bsd.strip
- ${STRIP} ${STRIPOPTS} bsd.strip
+ objcopy -Sg -R .comment -R .SUNW_ctf -R .shstrtab -R .shstrtab bsd.rd bsd.strip
+ strip bsd.strip
${GZIPCMD} -c ${GZIPFLAGS} bsd.strip > bsd.gz
bsd.rd: bsd ${IMAGE} rdsetroot
cp bsd bsd.rd
${.OBJDIR}/rdsetroot bsd.rd ${IMAGE}
- strip -R .SUNW_ctf bsd.rd
bsd:
cd ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK} && \
diff --git a/distrib/alpha/inst-common/Makefile.inc b/distrib/alpha/inst-common/Makefile.inc
index e6530b292eb..2af1251c637 100644
--- a/distrib/alpha/inst-common/Makefile.inc
+++ b/distrib/alpha/inst-common/Makefile.inc
@@ -1,5 +1,5 @@
#
-# $OpenBSD: Makefile.inc,v 1.14 2017/08/12 19:41:16 jasper Exp $
+# $OpenBSD: Makefile.inc,v 1.15 2017/09/17 16:33:08 deraadt Exp $
#
# TOP is assumed to be defined by Makefile including this one.
@@ -11,7 +11,7 @@ LISTS?= ${.CURDIR}/../common/list
CRUNCHCONF?= ${CBIN}.conf
MTREE= ${UTILS}/mtree.conf
STRIP= strip
-STRIPOPTS?= -R .eh_frame -R .SUNW_ctf
+STRIPOPTS?= -R .eh_frame -R .SUNW_ctf -R .shstrtab
${CRUNCHCONF}: ${LISTS}
awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf