diff options
| author |   otto <otto@openbsd.org> | 2011-05-24 15:27:56 +0000 |
|---|---|---|
| committer | otto <otto@openbsd.org> | 2011-05-24 15:27:56 +0000 |
| commit | 001bee15716217a1eafe6daf0a87d312546e45b7 (patch) | |
| tree | c61701ffbdf0de9d7c652100427f6e5e7946dec2 | |
| parent | Reimplement uvm/uvm_map. (diff) | |
| download | wireguard-openbsd-001bee15716217a1eafe6daf0a87d312546e45b7.tar.xz wireguard-openbsd-001bee15716217a1eafe6daf0a87d312546e45b7.zip | |
Allow for more room for /usr/obj on static linking only archs; ok krw@ deraadt@
| -rw-r--r-- | sbin/disklabel/Makefile | 6 | ||||
| -rw-r--r-- | sbin/disklabel/editor.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile index d18917cf65f..1006951e93d 100644 --- a/sbin/disklabel/Makefile +++ b/sbin/disklabel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.51 2010/03/18 12:27:13 otto Exp $ +# $OpenBSD: Makefile,v 1.52 2011/05/24 15:27:56 otto Exp $ PROG= disklabel SRCS= disklabel.c dkcksum.c editor.c manual.c @@ -62,4 +62,8 @@ CFLAGS+= -DSEEALSO="\"installboot(8)\"" -DSUN_CYLCHECK -DSUN_AAT0 CFLAGS+= -DSEEALSO="\"fdisk(8)\"" .endif +.ifdef NOPIC +CFLAGS+= -DSTATICLINKING +.endif + .include <bsd.prog.mk> diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c index 688c1113c8a..10b77db8ab6 100644 --- a/sbin/disklabel/editor.c +++ b/sbin/disklabel/editor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: editor.c,v 1.255 2011/05/23 08:22:29 otto Exp $ */ +/* $OpenBSD: editor.c,v 1.256 2011/05/24 15:27:56 otto Exp $ */ /* * Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com> @@ -78,7 +78,11 @@ const struct space_allocation alloc_big[] = { { MEG(512), GIG(1), 3, "/usr/X11R6" }, { GIG(2), GIG(10), 10, "/usr/local" }, { GIG(1), GIG(2), 2, "/usr/src" }, +#ifdef STATICLINKING + { MEG(2600), GIG(3), 4, "/usr/obj" }, +#else { MEG(1300), GIG(2), 4, "/usr/obj" }, +#endif { GIG(1), GIG(300), 45, "/home" } /* Anything beyond this leave for the user to decide */ }; |