From 3aefc4c6e2ec962e7ae0d6f6f05be85f3bbfb909 Mon Sep 17 00:00:00 2001
From: otto <otto@openbsd.org>
Date: Wed, 19 Apr 2017 05:27:00 +0000
Subject: [PATCH] enlarge obj to satisfy new world order that has *big*
 compilers and remove condition for static linking; ok tb@

---
 sbin/disklabel/Makefile | 6 +-----
 sbin/disklabel/editor.c | 8 ++------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile
index 45429f7e686..23eda50f9fd 100644
--- a/sbin/disklabel/Makefile
+++ b/sbin/disklabel/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.64 2016/09/21 20:12:27 fcambus Exp $
+#	$OpenBSD: Makefile,v 1.65 2017/04/19 05:27:00 otto Exp $
 
 PROG=	disklabel
 SRCS=	disklabel.c dkcksum.c editor.c manual.c
@@ -49,8 +49,4 @@ CFLAGS+= -DSEEALSO="\"fdisk(8), pdisk(8)\""
 CFLAGS+= -DSEEALSO="\"installboot(8)\"" -DSUN_CYLCHECK -DSUN_AAT0
 .endif
 
-.ifdef NOPIC
-CFLAGS+= -DSTATICLINKING
-.endif
-
 .include <bsd.prog.mk>
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c
index b8aa4a0b36b..cf3a8c535b2 100644
--- a/sbin/disklabel/editor.c
+++ b/sbin/disklabel/editor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: editor.c,v 1.305 2017/03/04 07:26:42 otto Exp $	*/
+/*	$OpenBSD: editor.c,v 1.306 2017/04/19 05:27:00 otto Exp $	*/
 
 /*
  * Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -78,11 +78,7 @@ 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(3),         GIG(6),   4, "/usr/obj"	},
 	{    GIG(1),       GIG(300),  40, "/home"	}
 	/* Anything beyond this leave for the user to decide */
 };
-- 
2.20.1