From 7f9b314ff2ffb784dfe43eb0daa565a4da22809a Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 1 Dec 2014 21:04:26 +0000
Subject: [PATCH] Pull in the NetBSD global offset table handling code. Clang
 3.5 creates relocations the linker complains about.

Obtained from:	NetBSD
MFC after:	1 Week
---
 sys/arm/include/asm.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h
index bd4b6361f3c..73b7355130c 100644
--- a/sys/arm/include/asm.h
+++ b/sys/arm/include/asm.h
@@ -112,10 +112,16 @@
 	ldr	x, [x, got]
 #define	GOT_INIT(got,gotsym,pclabel) \
 	ldr	got, gotsym;	\
-	add	got, got, pc;	\
-	pclabel:
+	pclabel: add	got, got, pc
+#ifdef __thumb__
 #define	GOT_INITSYM(gotsym,pclabel) \
-	gotsym: .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) + (. - (pclabel+4))
+	.align 0;		\
+	gotsym: .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) - (pclabel+4)
+#else
+#define	GOT_INITSYM(gotsym,pclabel) \
+	.align 0;		\
+	gotsym: .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) - (pclabel+8)
+#endif
 
 #ifdef __STDC__
 #define	PIC_SYM(x,y)	x ## ( ## y ## )