From owner-svn-src-head@freebsd.org  Tue Aug  4 18:23:33 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 9C8DB37B7D7;
 Tue,  4 Aug 2020 18:23:33 +0000 (UTC) (envelope-from jhb@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)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 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 4BLjn13fHVz3RwN;
 Tue,  4 Aug 2020 18:23:33 +0000 (UTC) (envelope-from jhb@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 61C9196F6;
 Tue,  4 Aug 2020 18:23:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 074INXxc054019;
 Tue, 4 Aug 2020 18:23:33 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 074INXHM054018;
 Tue, 4 Aug 2020 18:23:33 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <202008041823.074INXHM054018@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 4 Aug 2020 18:23:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r363848 - head/lib/csu/mips
X-SVN-Group: head
X-SVN-Commit-Author: jhb
X-SVN-Commit-Paths: head/lib/csu/mips
X-SVN-Commit-Revision: 363848
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.33
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: Tue, 04 Aug 2020 18:23:33 -0000

Author: jhb
Date: Tue Aug  4 18:23:32 2020
New Revision: 363848
URL: https://svnweb.freebsd.org/changeset/base/363848

Log:
  ld.bfd requires an explicit emulation for MIPS for ld -r.
  
  Unlike lld, ld.bfd doesn't infer the emulation from the first object
  file, but assumes its compiled in default for ld -r.
  
  Differential Revision:	https://reviews.freebsd.org/D25728

Modified:
  head/lib/csu/mips/Makefile

Modified: head/lib/csu/mips/Makefile
==============================================================================
--- head/lib/csu/mips/Makefile	Tue Aug  4 18:20:39 2020	(r363847)
+++ head/lib/csu/mips/Makefile	Tue Aug  4 18:23:32 2020	(r363848)
@@ -2,6 +2,27 @@
 
 .PATH: ${.CURDIR:H}/common
 
+.include <src.opts.mk>
+
 CFLAGS+=	-DCRT_IRELOC_SUPPRESS
+
+.if ${MACHINE_ARCH:Mmips64}
+ELFCLASS=	64
+.else
+ELFCLASS=	32
+.endif
+.if ${MACHINE_ARCH:Mmips*el}
+ENDIAN=		l
+.else
+ENDIAN=		b
+.endif
+.if ${MACHINE_ARCH:Mmipsn32*}
+SUFFIX=		n32
+.else
+SUFFIX=
+.endif
+
+# binutils requires an explicit emulation for ld -r
+LDFLAGS.bfd+=	-Wl,-m -Wl,elf${ELFCLASS}${ENDIAN}tsmip${SUFFIX}_fbsd
 
 .include <bsd.lib.mk>