From owner-svn-src-head@freebsd.org  Tue Jan 10 20:12:08 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 826F4CA9D99;
 Tue, 10 Jan 2017 20:12:08 +0000 (UTC)
 (envelope-from gonzo@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 529431B6C;
 Tue, 10 Jan 2017 20:12:08 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0AKC7MA059368;
 Tue, 10 Jan 2017 20:12:07 GMT (envelope-from gonzo@FreeBSD.org)
Received: (from gonzo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0AKC7IP059367;
 Tue, 10 Jan 2017 20:12:07 GMT (envelope-from gonzo@FreeBSD.org)
Message-Id: <201701102012.v0AKC7IP059367@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gonzo set sender to
 gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Tue, 10 Jan 2017 20:12:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r311890 - head/sys/boot/efi/loader/arch/arm
X-SVN-Group: head
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: Tue, 10 Jan 2017 20:12:08 -0000

Author: gonzo
Date: Tue Jan 10 20:12:07 2017
New Revision: 311890
URL: https://svnweb.freebsd.org/changeset/base/311890

Log:
  [efi] Fix .rel.data.* being erroneously merged into .data on ARM
  
  Fix section pattern code to exclude .rel.data.* sections from being
  merged into .data. Otherwise relocations in those sections are lost
  in final binary
  
  Reviewed by:	andrew
  MFC after:	3 days
  Differential Revision:	https://reviews.freebsd.org/D9108

Modified:
  head/sys/boot/efi/loader/arch/arm/ldscript.arm

Modified: head/sys/boot/efi/loader/arch/arm/ldscript.arm
==============================================================================
--- head/sys/boot/efi/loader/arch/arm/ldscript.arm	Tue Jan 10 20:09:35 2017	(r311889)
+++ head/sys/boot/efi/loader/arch/arm/ldscript.arm	Tue Jan 10 20:12:07 2017	(r311890)
@@ -18,7 +18,7 @@ SECTIONS
   . = ALIGN(16);
   .data    :
   {
-    *(.data *.data.*)
+    *(.data .data.*)
     *(.gnu.linkonce.d*)
     *(.rodata)
     *(.rodata.*)