Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Jun 2012 18:39:35 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r237491 - in stable/9: lib/libc/arm lib/libc/arm/gen sys/arm/include
Message-ID:  <201206231839.q5NIdZOD057490@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marius
Date: Sat Jun 23 18:39:35 2012
New Revision: 237491
URL: http://svn.freebsd.org/changeset/base/237491

Log:
  MFC: r231616, r232497, r234337
  
  Add __aeabi_read_tp function required for thread-local storage.

Added:
  stable/9/lib/libc/arm/gen/__aeabi_read_tp.S
     - copied unchanged from r234337, head/lib/libc/arm/gen/__aeabi_read_tp.S
Modified:
  stable/9/lib/libc/arm/Symbol.map
  stable/9/lib/libc/arm/gen/Makefile.inc
  stable/9/sys/arm/include/armreg.h
  stable/9/sys/arm/include/sysarch.h
Directory Properties:
  stable/9/lib/libc/   (props changed)
  stable/9/lib/libc/stdtime/   (props changed)
  stable/9/lib/libc/sys/   (props changed)
  stable/9/lib/libc/uuid/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/dev/e1000/   (props changed)
  stable/9/sys/dev/isp/   (props changed)
  stable/9/sys/dev/ixgbe/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/modules/   (props changed)

Modified: stable/9/lib/libc/arm/Symbol.map
==============================================================================
--- stable/9/lib/libc/arm/Symbol.map	Sat Jun 23 18:26:23 2012	(r237490)
+++ stable/9/lib/libc/arm/Symbol.map	Sat Jun 23 18:39:35 2012	(r237491)
@@ -41,6 +41,7 @@ FBSDprivate_1.0 {
 	__sys_exit;
 
 	_set_tp;
+	__aeabi_read_tp;
 	___longjmp;
 	__umodsi3;
 	__modsi3;

Modified: stable/9/lib/libc/arm/gen/Makefile.inc
==============================================================================
--- stable/9/lib/libc/arm/gen/Makefile.inc	Sat Jun 23 18:26:23 2012	(r237490)
+++ stable/9/lib/libc/arm/gen/Makefile.inc	Sat Jun 23 18:39:35 2012	(r237491)
@@ -3,4 +3,4 @@
 
 SRCS+=	_ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.c \
 	getcontextx.c infinity.c ldexp.c makecontext.c modf.c \
-	setjmp.S signalcontext.c sigsetjmp.S divsi3.S
+	__aeabi_read_tp.S setjmp.S signalcontext.c sigsetjmp.S divsi3.S

Copied: stable/9/lib/libc/arm/gen/__aeabi_read_tp.S (from r234337, head/lib/libc/arm/gen/__aeabi_read_tp.S)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/lib/libc/arm/gen/__aeabi_read_tp.S	Sat Jun 23 18:39:35 2012	(r237491, copy of r234337, head/lib/libc/arm/gen/__aeabi_read_tp.S)
@@ -0,0 +1,40 @@
+/*-
+ * Copyright (c) 2012 Oleksandr Tymoshenko
+ * Copyright (c) 2012 Andrew Turner
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
+#include <machine/sysarch.h>
+
+ENTRY(__aeabi_read_tp)
+	ldr	r0, .Larm_tp_address
+	ldr	r0, [r0]
+	RET
+
+.Larm_tp_address:
+	.word ARM_TP_ADDRESS
+

Modified: stable/9/sys/arm/include/armreg.h
==============================================================================
--- stable/9/sys/arm/include/armreg.h	Sat Jun 23 18:26:23 2012	(r237490)
+++ stable/9/sys/arm/include/armreg.h	Sat Jun 23 18:39:35 2012	(r237491)
@@ -316,8 +316,13 @@
 /*
  * Address of the vector page, low and high versions.
  */
+#ifndef __ASSEMBLER__
 #define	ARM_VECTORS_LOW		0x00000000U
 #define	ARM_VECTORS_HIGH	0xffff0000U
+#else
+#define	ARM_VECTORS_LOW		0
+#define	ARM_VECTORS_HIGH	0xffff0000
+#endif
 
 /*
  * ARM Instructions

Modified: stable/9/sys/arm/include/sysarch.h
==============================================================================
--- stable/9/sys/arm/include/sysarch.h	Sat Jun 23 18:26:23 2012	(r237490)
+++ stable/9/sys/arm/include/sysarch.h	Sat Jun 23 18:39:35 2012	(r237491)
@@ -55,6 +55,7 @@
 #define ARM_RAS_END		(ARM_TP_ADDRESS + 8)
 
 #ifndef LOCORE
+#ifndef __ASSEMBLER__
 
 #include <sys/cdefs.h>
 
@@ -85,6 +86,7 @@ int	sysarch(int, void *);
 __END_DECLS
 #endif
 
+#endif /* __ASSEMBLER__ */
 #endif /* LOCORE */
 
 #endif /* !_ARM_SYSARCH_H_ */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206231839.q5NIdZOD057490>