From owner-svn-src-head@freebsd.org  Mon Jan 27 12:02:48 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 17A3D1F485F;
 Mon, 27 Jan 2020 12:02:48 +0000 (UTC)
 (envelope-from arichardson@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 485pKM6vdDz4JbC;
 Mon, 27 Jan 2020 12:02:47 +0000 (UTC)
 (envelope-from arichardson@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E4C999A99;
 Mon, 27 Jan 2020 12:02:47 +0000 (UTC)
 (envelope-from arichardson@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00RC2l0w082625;
 Mon, 27 Jan 2020 12:02:47 GMT (envelope-from arichardson@FreeBSD.org)
Received: (from arichardson@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00RC2lee082624;
 Mon, 27 Jan 2020 12:02:47 GMT (envelope-from arichardson@FreeBSD.org)
Message-Id: <202001271202.00RC2lee082624@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arichardson set sender to
 arichardson@FreeBSD.org using -f
From: Alex Richardson <arichardson@FreeBSD.org>
Date: Mon, 27 Jan 2020 12:02:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r357170 - head/share/mk
X-SVN-Group: head
X-SVN-Commit-Author: arichardson
X-SVN-Commit-Paths: head/share/mk
X-SVN-Commit-Revision: 357170
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.29
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: Mon, 27 Jan 2020 12:02:48 -0000

Author: arichardson
Date: Mon Jan 27 12:02:47 2020
New Revision: 357170
URL: https://svnweb.freebsd.org/changeset/base/357170

Log:
  Build hard-float lib32 for mips64hf/mips64elhf
  
  This should fix linker errors when building with clang+lld.
  After this change the lib32 compat libraries are now buildt with
  -mhard-float instead of -msoft-float
  
  Reviewed By:	brooks, jhb
  Differential Revision: https://reviews.freebsd.org/D23229

Modified:
  head/share/mk/bsd.compat.mk

Modified: head/share/mk/bsd.compat.mk
==============================================================================
--- head/share/mk/bsd.compat.mk	Mon Jan 27 12:02:41 2020	(r357169)
+++ head/share/mk/bsd.compat.mk	Mon Jan 27 12:02:47 2020	(r357170)
@@ -79,11 +79,10 @@ LIB32CPUFLAGS=  -target mips-unknown-freebsd13.0
 .endif
 LIB32CPUFLAGS+= -mabi=32
 LIB32_MACHINE=	mips
+LIB32_MACHINE_ARCH:=	${COMPAT_ARCH:S/64//}
 .if ${COMPAT_ARCH:Mmips64el*} != ""
-LIB32_MACHINE_ARCH=	mipsel
 _EMULATION=	elf32ltsmip_fbsd
 .else
-LIB32_MACHINE_ARCH=	mips
 _EMULATION=	elf32btsmip_fbsd
 .endif
 LIB32WMAKEFLAGS= LD="${XLD} -m ${_EMULATION}"