From owner-svn-src-head@freebsd.org  Sat Dec  2 00:07:16 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 11DD8DBB212;
 Sat,  2 Dec 2017 00:07:16 +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 D0D12779D3;
 Sat,  2 Dec 2017 00:07:15 +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 vB207EKY033794;
 Sat, 2 Dec 2017 00:07:14 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB207EGL033793;
 Sat, 2 Dec 2017 00:07:14 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201712020007.vB207EGL033793@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:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326444 - head/stand/geli
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/stand/geli
X-SVN-Commit-Revision: 326444
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:16 -0000

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

Log:
  Move geli to common DO32 stuff
  
  define DO32 since this is only build in amd64/i386
  Remove files not needed.
  
  Sponsored by: Netflix

Modified:
  head/stand/geli/Makefile

Modified: head/stand/geli/Makefile
==============================================================================
--- head/stand/geli/Makefile	Sat Dec  2 00:07:09 2017	(r326443)
+++ head/stand/geli/Makefile	Sat Dec  2 00:07:14 2017	(r326444)
@@ -2,6 +2,7 @@
 # libgeliboot
 
 MAN=
+DO32=1
 
 .include <bsd.init.mk>
 MK_SSP=		no
@@ -11,18 +12,7 @@ INTERNALLIB=
 MK_PROFILE=	no
 NO_PIC=
 
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
-CFLAGS+=        -march=i386
-.endif
-.if ${MACHINE_ARCH} == "amd64"
-CFLAGS+=        -m32
-.endif
-
 WARNS?=		0
-
-# string functions from libc
-.PATH: ${SRCTOP}/lib/libc/string
-SRCS+=  bcmp.c bcopy.c bzero.c
 
 # Our password input method
 SRCS+=  pwgets.c