From owner-svn-src-projects@FreeBSD.ORG  Thu Mar 13 14:34:25 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B699CC7E;
 Thu, 13 Mar 2014 14:34:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A4480EC7;
 Thu, 13 Mar 2014 14:34:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2DEYPEB028501;
 Thu, 13 Mar 2014 14:34:25 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2DEYPMj028500;
 Thu, 13 Mar 2014 14:34:25 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201403131434.s2DEYPMj028500@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 13 Mar 2014 14:34:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r263108 - projects/uefi/lib/libstand
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Mar 2014 14:34:25 -0000

Author: emaste
Date: Thu Mar 13 14:34:25 2014
New Revision: 263108
URL: http://svnweb.freebsd.org/changeset/base/263108

Log:
  Undo lib/libstand Makefile changes on UEFI branch
  
  32- and 64-bit versions of libstand are now built under sys/boot for
  bootloaders; changes to the version in lib are not required.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/uefi/lib/libstand/Makefile

Modified: projects/uefi/lib/libstand/Makefile
==============================================================================
--- projects/uefi/lib/libstand/Makefile	Thu Mar 13 06:54:10 2014	(r263107)
+++ projects/uefi/lib/libstand/Makefile	Thu Mar 13 14:34:25 2014	(r263108)
@@ -24,7 +24,6 @@ CFLAGS+= -I${.CURDIR}
 CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
 .endif
 .if ${MACHINE_CPUARCH} == "i386"
-CFLAGS+=	-march=i386
 CFLAGS.gcc+=	-mpreferred-stack-boundary=2
 .endif
 .if ${MACHINE_CPUARCH} == "amd64"
@@ -109,7 +108,7 @@ SRCS+= uuid_equal.c uuid_is_nil.c
 .if ${MACHINE_ARCH} == "powerpc64"
 .PATH: ${.CURDIR}/powerpc
 .else
-.PATH: ${.CURDIR}/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/${MACHINE_CPUARCH}
 .endif
 SRCS+=	_setjmp.S