From owner-svn-src-all@FreeBSD.ORG  Sun Apr  8 04:36:27 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DF1641065670;
	Sun,  8 Apr 2012 04:36:27 +0000 (UTC)
	(envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CA9F88FC12;
	Sun,  8 Apr 2012 04:36:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q384aRlR093118;
	Sun, 8 Apr 2012 04:36:27 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q384aRXS093116;
	Sun, 8 Apr 2012 04:36:27 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201204080436.q384aRXS093116@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sun, 8 Apr 2012 04:36:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234014 - head/lib/libc/arm/gen
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: Sun, 08 Apr 2012 04:36:28 -0000

Author: andrew
Date: Sun Apr  8 04:36:27 2012
New Revision: 234014
URL: http://svn.freebsd.org/changeset/base/234014

Log:
  Unlike other functions __aeabi_read_tp function must preserve r1-r3. The
  currently generated code clobbers r3. Fix this by loading ARM_TP_ADDRESS
  using inline assembly.
  
  Approved by:	imp (mentor)

Modified:
  head/lib/libc/arm/gen/__aeabi_read_tp.c

Modified: head/lib/libc/arm/gen/__aeabi_read_tp.c
==============================================================================
--- head/lib/libc/arm/gen/__aeabi_read_tp.c	Sun Apr  8 04:22:09 2012	(r234013)
+++ head/lib/libc/arm/gen/__aeabi_read_tp.c	Sun Apr  8 04:36:27 2012	(r234014)
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2012 Oleksandr Tymoshenko
+ * Copyright (c) 2012 Andrew Turner
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +37,9 @@ __FBSDID("$FreeBSD$");
 void *
 __aeabi_read_tp()
 {
-	void **_tp = (void **)ARM_TP_ADDRESS;
+	void *_tp;
 
-	return (*_tp);
+	asm("ldr %0, [%1]\n" : "=r"(_tp) : "r"(ARM_TP_ADDRESS));
+
+	return _tp;
 }