From owner-svn-src-all@freebsd.org  Tue Feb  9 00:15:43 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 220F7A98617;
 Tue,  9 Feb 2016 00:15:43 +0000 (UTC)
 (envelope-from andrew@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 E715A1183;
 Tue,  9 Feb 2016 00:15:42 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u190FfYc092633;
 Tue, 9 Feb 2016 00:15:41 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u190FfnN092632;
 Tue, 9 Feb 2016 00:15:41 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201602090015.u190FfnN092632@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Tue, 9 Feb 2016 00:15:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295421 - head/sys/boot
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.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Feb 2016 00:15:43 -0000

Author: andrew
Date: Tue Feb  9 00:15:41 2016
New Revision: 295421
URL: https://svnweb.freebsd.org/changeset/base/295421

Log:
  Stop clang from generating movt/movw sequences. These don't get relocated
  so will access data from an unrelocated address. This is only needed for
  self relocating code on ARMv7, however this is true for both ubldr and
  loader.efi, the only two loaders we support on ARMv7.
  
  While here also force the fpu to be none as is done in libstand.
  
  Sponsored by:	ABT Systems Ltd

Modified:
  head/sys/boot/Makefile.inc

Modified: head/sys/boot/Makefile.inc
==============================================================================
--- head/sys/boot/Makefile.inc	Tue Feb  9 00:01:43 2016	(r295420)
+++ head/sys/boot/Makefile.inc	Tue Feb  9 00:15:41 2016	(r295421)
@@ -1,3 +1,11 @@
 # $FreeBSD$
 
 SSP_CFLAGS=
+
+.if ${MACHINE_CPUARCH} == "arm"
+# Do not generate movt/movw, because the relocation fixup for them does not
+# translate to the -Bsymbolic -pie format required by self_reloc() in loader(8).
+# Also, the fpu is not available in a standalone environment.
+CFLAGS.clang+=  -mllvm -arm-use-movt=0
+CFLAGS.clang+=  -mfpu=none
+.endif