From owner-svn-src-stable@freebsd.org  Mon Jan 11 00:43:51 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 94A6DA6A1DE;
 Mon, 11 Jan 2016 00:43:51 +0000 (UTC)
 (envelope-from emaste@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 3F2481EA9;
 Mon, 11 Jan 2016 00:43:51 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0B0hoIQ031202;
 Mon, 11 Jan 2016 00:43:50 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0B0hoQa031200;
 Mon, 11 Jan 2016 00:43:50 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201601110043.u0B0hoQa031200@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 11 Jan 2016 00:43:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r293649 - in stable/10/sys/boot/efi: . boot1
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jan 2016 00:43:51 -0000

Author: emaste
Date: Mon Jan 11 00:43:50 2016
New Revision: 293649
URL: https://svnweb.freebsd.org/changeset/base/293649

Log:
  MFC r281027: Clean up more x86 only options in the efi code.

Modified:
  stable/10/sys/boot/efi/Makefile.inc
  stable/10/sys/boot/efi/boot1/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/efi/Makefile.inc
==============================================================================
--- stable/10/sys/boot/efi/Makefile.inc	Sun Jan 10 23:41:31 2016	(r293648)
+++ stable/10/sys/boot/efi/Makefile.inc	Mon Jan 11 00:43:50 2016	(r293649)
@@ -8,9 +8,14 @@ CFLAGS+=        -march=i386
 
 # Options used when building app-specific efi components
 # See conf/kern.mk for the correct set of these
-CFLAGS+=	-ffreestanding -fshort-wchar -Wformat
-CFLAGS+=	-mno-red-zone
-CFLAGS+=	-mno-mmx -mno-sse -mno-aes -mno-avx -msoft-float
+CFLAGS+=	-ffreestanding -Wformat -msoft-float
 LDFLAGS+=	-nostdlib
 
+.if ${MACHINE_CPUARCH} == "amd64"
+CFLAGS+=	-fshort-wchar
+CFLAGS+=	-mno-red-zone
+CFLAGS+=	-mno-mmx -mno-sse -mno-aes -mno-avx
+.endif
+
+
 .include "../Makefile.inc"

Modified: stable/10/sys/boot/efi/boot1/Makefile
==============================================================================
--- stable/10/sys/boot/efi/boot1/Makefile	Sun Jan 10 23:41:31 2016	(r293648)
+++ stable/10/sys/boot/efi/boot1/Makefile	Mon Jan 11 00:43:50 2016	(r293649)
@@ -32,7 +32,11 @@ FILES=	boot1.efi boot1.efifat
 FILESMODE_boot1.efi=	${BINMODE}
 
 LDSCRIPT=	${.CURDIR}/../loader/arch/${MACHINE}/ldscript.${MACHINE}
-LDFLAGS=	-Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared -Wl,-znocombreloc
+LDFLAGS=	-Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared
+
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+LDFLAGS+=	-Wl,-znocombreloc
+.endif
 
 ${PROG}:	${LDSCRIPT}
 
@@ -75,6 +79,7 @@ CLEANFILES= boot1.efifat
 
 .include <bsd.prog.mk>
 
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 beforedepend ${OBJS}: machine x86
 
 CLEANFILES+=   machine x86 boot1.efi
@@ -84,3 +89,4 @@ machine:
 
 x86:
 	ln -sf ${.CURDIR}/../../../x86/include x86
+.endif