Module Name: src
Committed By: matt
Date: Thu Aug 15 22:34:59 UTC 2013
Modified Files:
src/sys/arch/arm/include: mcontext.h
Log Message:
If compiling for Thumb1, make __lwp_getprivate_fast call __aeabi_read_tp.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/include/mcontext.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/mcontext.h
diff -u src/sys/arch/arm/include/mcontext.h:1.15 src/sys/arch/arm/include/mcontext.h:1.16
--- src/sys/arch/arm/include/mcontext.h:1.15 Sat Dec 8 06:58:36 2012
+++ src/sys/arch/arm/include/mcontext.h Thu Aug 15 22:34:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.15 2012/12/08 06:58:36 matt Exp $ */
+/* $NetBSD: mcontext.h,v 1.16 2013/08/15 22:34:59 matt Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -123,6 +123,7 @@ typedef struct {
static __inline void *
__lwp_getprivate_fast(void)
{
+#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
extern void *_lwp_getprivate(void);
void *rv;
__asm("mrc p15, 0, %0, c13, c0, 3" : "=r"(rv));
@@ -135,6 +136,10 @@ __lwp_getprivate_fast(void)
* syscall.
*/
return _lwp_getprivate();
+#else
+ extern void *__aeabi_read_tp(void);
+ return __aeabi_read_tp();
+#endif /* !__thumb__ || _ARM_ARCH_T2 */
}
#if defined(_KERNEL)
