svn commit: r325172 - in head/sys/boot/sparc64: boot1 loader

[Warner Losh]

Author: imp
Date: Mon Oct 30 23:14:44 2017
New Revision: 325172
URL: https://svnweb.freebsd.org/changeset/base/325172

Log:
  Remove the -nostdlib stuff I added. Instead, fix LDFLAGS to be honored
  correctly with the new Makefile.inc include order.
  
  Sponsored by: Netflix

Modified:
  head/sys/boot/sparc64/boot1/Makefile
  head/sys/boot/sparc64/loader/Makefile

Modified: head/sys/boot/sparc64/boot1/Makefile
==============================================================================
--- head/sys/boot/sparc64/boot1/Makefile	Mon Oct 30 23:14:37 2017	(r325171)
+++ head/sys/boot/sparc64/boot1/Makefile	Mon Oct 30 23:14:44 2017	(r325172)
@@ -13,8 +13,8 @@ BOOTBLOCKBASE= 0x4000
 
 CFLAGS.clang+=-mcmodel=small
 CFLAGS.gcc+=-mcmodel=medlow
-CFLAGS+=-Os -I${LDRSRC} -nostdlib
-LDFLAGS=-Ttext ${BOOTBLOCKBASE} -Wl,-N
+CFLAGS+=-Os -I${LDRSRC}
+LDFLAGS+=-Ttext ${BOOTBLOCKBASE} -Wl,-N
 
 # Construct boot1. sunlabel expects it to contain zeroed-out space for the
 # label, and to be of the correct size.

Modified: head/sys/boot/sparc64/loader/Makefile
==============================================================================
--- head/sys/boot/sparc64/loader/Makefile	Mon Oct 30 23:14:37 2017	(r325171)
+++ head/sys/boot/sparc64/loader/Makefile	Mon Oct 30 23:14:44 2017	(r325172)
@@ -25,8 +25,6 @@ LOADER_GZIP_SUPPORT?=	yes
 LOADER_BZIP2_SUPPORT?=	no
 LOADER_DEBUG?=		no
 
-CFLAGS+=-nostdlib
-
 .if ${LOADER_DEBUG} == "yes"
 CFLAGS+=	-DLOADER_DEBUG
 .endif
@@ -43,7 +41,7 @@ CFLAGS+=	-I.
 
 CLEANFILES+=	loader.help
 
-LDFLAGS=	-static
+LDFLAGS+=	-static
 
 # Open Firmware standalone support library
 LIBOFW=		${BOOTOBJ}/ofw/libofw/libofw.a