From owner-svn-src-head@freebsd.org  Wed Aug 16 18:55:40 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 6B188DC8F66;
 Wed, 16 Aug 2017 18:55:40 +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 33A9A6B1A5;
 Wed, 16 Aug 2017 18:55:40 +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 v7GItdHb083728;
 Wed, 16 Aug 2017 18:55:39 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7GItdFB083727;
 Wed, 16 Aug 2017 18:55:39 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201708161855.v7GItdFB083727@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: Wed, 16 Aug 2017 18:55:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r322589 - head/lib/libc/i386
X-SVN-Group: head
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: head/lib/libc/i386
X-SVN-Commit-Revision: 322589
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.23
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: Wed, 16 Aug 2017 18:55:40 -0000

Author: emaste
Date: Wed Aug 16 18:55:39 2017
New Revision: 322589
URL: https://svnweb.freebsd.org/changeset/base/322589

Log:
  force use of ld.bfd for linking i386 libc, even when using lld
  
  lld can successfully link most of a working i386 userland and kernel,
  but produces a broken libc. For now if we're otherwise using lld, and
  ld.bfd is available, explicitly use it for libc.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/lib/libc/i386/Makefile.inc

Modified: head/lib/libc/i386/Makefile.inc
==============================================================================
--- head/lib/libc/i386/Makefile.inc	Wed Aug 16 18:48:53 2017	(r322588)
+++ head/lib/libc/i386/Makefile.inc	Wed Aug 16 18:55:39 2017	(r322589)
@@ -4,3 +4,13 @@
 GDTOASRCS+=strtorx.c
 SRCS+=machdep_ldisx.c
 SYM_MAPS+=${LIBC_SRCTOP}/i386/Symbol.map
+
+# XXX force use of ld.bfd for linking i386 libc
+#
+# lld can successfully link most of a working i386 userland and kernel,
+# but produces a broken libc. For now if we're otherwise using lld, and
+# ld.bfd is available, explicitly use it for libc.
+.include <bsd.linker.mk>
+.if ${LINKER_TYPE} == "lld" && ${MK_BINUTILS_BOOTSTRAP} != "no"
+LDFLAGS+=-fuse-ld=bfd
+.endif