From owner-svn-src-head@freebsd.org  Sat Dec  2 00:07:06 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC774DBB193;
 Sat,  2 Dec 2017 00:07:06 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 917B177875;
 Sat,  2 Dec 2017 00:07:06 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB2074vs033639;
 Sat, 2 Dec 2017 00:07:04 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB2074ke033637;
 Sat, 2 Dec 2017 00:07:04 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201712020007.vB2074ke033637@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 2 Dec 2017 00:07:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326442 - in head/stand: . powerpc/boot1.chrp
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: in head/stand: . powerpc/boot1.chrp
X-SVN-Commit-Revision: 326442
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Dec 2017 00:07:07 -0000

Author: imp
Date: Sat Dec  2 00:07:04 2017
New Revision: 326442
URL: https://svnweb.freebsd.org/changeset/base/326442

Log:
  Cleanup CFALGS usage here
  
  Only define the CFLAGS we need.
  SSP_CFLAGS is now defined globally, no need to define it here.
  Define -D_STANDALONE globally for src/stand builds.
  
  Sponsored by: Netflix

Modified:
  head/stand/defs.mk
  head/stand/powerpc/boot1.chrp/Makefile

Modified: head/stand/defs.mk
==============================================================================
--- head/stand/defs.mk	Sat Dec  2 00:06:58 2017	(r326441)
+++ head/stand/defs.mk	Sat Dec  2 00:07:04 2017	(r326442)
@@ -39,7 +39,7 @@ LIBSA32=	${BOOTOBJ}/libsa32/libsa32.a
 .endif
 
 # Standard options:
-CFLAGS+=	-I${SASRC}
+CFLAGS+=	-I${SASRC} -D_STANDALONE
 CFLAGS+=	-I${SYSDIR}
 
 # Filesystem support

Modified: head/stand/powerpc/boot1.chrp/Makefile
==============================================================================
--- head/stand/powerpc/boot1.chrp/Makefile	Sat Dec  2 00:06:58 2017	(r326441)
+++ head/stand/powerpc/boot1.chrp/Makefile	Sat Dec  2 00:07:04 2017	(r326442)
@@ -2,8 +2,6 @@
 
 .include <bsd.init.mk>
 
-SSP_CFLAGS=
-
 PROG=           boot1.elf
 NEWVERSWHAT=    "Open Firmware boot block" ${MACHINE_ARCH}
 INSTALLFLAGS=   -b
@@ -13,7 +11,7 @@ SRCS=		boot1.c ashldi3.c syncicache.c
 
 MAN=
 
-CFLAGS= -I${LDRSRC} -I${SYSDIR} -I${SASRC} -D_STANDALONE
+CFLAGS+=-I${LDRSRC}
 LDFLAGS=-nostdlib -static -Wl,-N
 
 .PATH:  ${SYSDIR}/libkern ${SRCTOP}/lib/libc/powerpc/gen ${.CURDIR}