From 8b790ea8465e094898438a87c3fc3dcd2c1a75bd Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 10 Mar 2021 22:52:28 +0000 Subject: [PATCH] Build install media with -fno-asynchronous-unwind-tables to further reduce size. Allows a clang 11 amd64 release to complete without overflowing the floppy image. ok kettenis@ deraadt@ --- distrib/special/Makefile.inc | 3 ++- usr.sbin/crunchgen/crunchgen.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/distrib/special/Makefile.inc b/distrib/special/Makefile.inc index 733d4964d8b..bc3c3ab6a96 100644 --- a/distrib/special/Makefile.inc +++ b/distrib/special/Makefile.inc @@ -1,6 +1,7 @@ # options for all the directories below -COPTS+=-Oz -fno-stack-protector -fno-unwind-tables +COPTS+=-Oz -fno-stack-protector +COPTS+=-fno-unwind-tables -fno-asynchronous-unwind-tables MAN= LDSTATIC=-static NOPIE= diff --git a/usr.sbin/crunchgen/crunchgen.c b/usr.sbin/crunchgen/crunchgen.c index 3b312b342b2..acf2d40cd88 100644 --- a/usr.sbin/crunchgen/crunchgen.c +++ b/usr.sbin/crunchgen/crunchgen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crunchgen.c,v 1.22 2021/02/13 18:52:08 semarie Exp $ */ +/* $OpenBSD: crunchgen.c,v 1.23 2021/03/10 22:52:28 jsg Exp $ */ /* * Copyright (c) 1994 University of Maryland @@ -897,6 +897,7 @@ top_makefile_rules(FILE * outmk) fprintf(outmk, "CFLAGS+=-Oz\n"); fprintf(outmk, "CFLAGS+=-fno-stack-protector\n"); fprintf(outmk, "CFLAGS+=-fno-unwind-tables\n"); + fprintf(outmk, "CFLAGS+=-fno-asynchronous-unwind-tables\n"); fprintf(outmk, "LDFLAGS+=$(NOPIE_LDFLAGS)\n"); fprintf(outmk, "STRIP?=strip\n"); fprintf(outmk, "LINK=$(LD) -dc -r ${LDFLAGS}\n"); -- 2.20.1