summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2015-03-17 19:59:40 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2015-03-17 19:59:40 +0000
commit32dd040cbf8895025294d9bb8427d58242b30a5b (patch)
tree2a3b255e6cd40724454b98db8e60459b36ba99f0
parentd89b46203d7381d858c629ed0767ba4bd4d51d71 (diff)
The innocuous change to libsa printf.c (1.26) causes printf.o to be 240 bytes
of text larger, and puts bootxx past the 7680 bytes limit. Since bootxx only needs printf for very simple panic() message involving %s and %d format specifiers only, compile a -DSTRIPPED version of printf.c for the use of bootxx. This makes bootxx return to a manageable size (it is even 8 bytes shorter now).
-rw-r--r--sys/arch/sparc/stand/bootxx/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/arch/sparc/stand/bootxx/Makefile b/sys/arch/sparc/stand/bootxx/Makefile
index 63392cd5992..241de4039d9 100644
--- a/sys/arch/sparc/stand/bootxx/Makefile
+++ b/sys/arch/sparc/stand/bootxx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2013/11/03 21:36:44 deraadt Exp $
+# $OpenBSD: Makefile,v 1.13 2015/03/17 19:59:39 miod Exp $
# $NetBSD: Makefile,v 1.2 1995/09/30 21:43:38 pk Exp $
.PATH: ${.CURDIR}/../common
@@ -15,8 +15,11 @@ CLEANFILES+=${PROG}.aout ${PROG}.elf elfclean
.PATH: ${S}/lib/libkern/arch/sparc ${S}/lib/libkern
SRCS+= __main.o bzero.o urem.o udiv.o
+.PATH: ${S}/lib/libsa
+SRCS+= printf.c
+
# pre-built bits of libsa
-SOBJS= alloc.o exit.o printf.o memcpy.o memset.o
+SOBJS= alloc.o exit.o memcpy.o memset.o
_SOBJS=${SOBJS:S,^,${LIBSAOBJDIR}/,g}
CFLAGS= -fno-pie -O2 -I${.CURDIR}/../common -I${.CURDIR}/../../../../arch \
@@ -40,3 +43,5 @@ srt0.o: srt0.S
${CC} ${CFLAGS} -D_LOCORE -c ${.IMPSRC}
.include <bsd.prog.mk>
+# for libsa printf
+DEFS+= -DSTRIPPED