From owner-svn-src-all@FreeBSD.ORG Tue Jan 22 04:14:28 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by hub.freebsd.org (Postfix) with ESMTP id A117D63A;
Tue, 22 Jan 2013 04:14:28 +0000 (UTC)
(envelope-from benno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 7D426159;
Tue, 22 Jan 2013 04:14:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0M4ESIt093651;
Tue, 22 Jan 2013 04:14:28 GMT (envelope-from benno@svn.freebsd.org)
Received: (from benno@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0M4ESQR093650;
Tue, 22 Jan 2013 04:14:28 GMT (envelope-from benno@svn.freebsd.org)
Message-Id: <201301220414.r0M4ESQR093650@svn.freebsd.org>
From: Benno Rice <benno@FreeBSD.org>
Date: Tue, 22 Jan 2013 04:14:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r245765 - head/sys/boot/i386/efi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jan 2013 04:14:28 -0000
Author: benno
Date: Tue Jan 22 04:14:27 2013
New Revision: 245765
URL: http://svnweb.freebsd.org/changeset/base/245765
Log:
Fix linking of loader.efi.
gcc handles -symbolic by passing -Bsymbolic through to ld. clang ignores
-symbolic and thus invokes ld without -Bsymbolic which leads to some symbols
not being properly linked in loader.efi. Fix this by using -Wl,-Bsymbolic which
passes -Bsymbolic to ld in both the gcc and clang cases.
Approved by: rpaulo
Modified:
head/sys/boot/i386/efi/Makefile
Modified: head/sys/boot/i386/efi/Makefile
==============================================================================
--- head/sys/boot/i386/efi/Makefile Tue Jan 22 03:43:28 2013 (r245764)
+++ head/sys/boot/i386/efi/Makefile Tue Jan 22 04:14:27 2013 (r245765)
@@ -36,7 +36,7 @@ FILES= loader.efi
FILESMODE_loader.efi= ${BINMODE}
LDSCRIPT= ${.CURDIR}/ldscript.i386
-LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic
+LDFLAGS= -Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared
${PROG}: ${LDSCRIPT}