Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not build arm toolchain symbols in the rump kernel 

These symbols will be provided at link time and will be
duplicate symbols in rump kernel and libc if defined.

Many have been fixed previously, but these were missed
as did not have a test.
This commit is contained in:
justin 2015-05-17 20:57:11 +00:00
parent 949bf31c77
commit b4bb74214e
15 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/lib/libc/arch/arm/atomic/atomic_op_asm.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: atomic_op_asm.h,v 1.6 2014/03/04 16:15:28 matt Exp $ */ /* $NetBSD: atomic_op_asm.h,v 1.7 2015/05/17 20:57:11 justin Exp $ */
/*- /*-
* Copyright (c) 2007 The NetBSD Foundation, Inc. * Copyright (c) 2007 The NetBSD Foundation, Inc.
@ -44,9 +44,6 @@
#if defined(_KERNEL) || defined(_STANDALONE) #if defined(_KERNEL) || defined(_STANDALONE)
#define ATOMIC_OP_ALIAS(a,s) STRONG_ALIAS(a,s) #define ATOMIC_OP_ALIAS(a,s) STRONG_ALIAS(a,s)
#ifdef _RUMPKERNEL
#define CRT_ALIAS(a,s) STRONG_ALIAS(a,s)
#endif
#else /* _KERNEL */ #else /* _KERNEL */

6
common/lib/libc/arch/arm/atomic/atomic_swap.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: atomic_swap.S,v 1.13 2015/04/17 07:15:02 skrll Exp $ */ /* $NetBSD: atomic_swap.S,v 1.14 2015/05/17 20:57:11 justin Exp $ */
/*- /*-
* Copyright (c) 2007,2012 The NetBSD Foundation, Inc. * Copyright (c) 2007,2012 The NetBSD Foundation, Inc.
@ -84,7 +84,7 @@ STRONG_ALIAS(_atomic_swap_uint,_atomic_swap_32)
STRONG_ALIAS(_atomic_swap_ulong,_atomic_swap_32) STRONG_ALIAS(_atomic_swap_ulong,_atomic_swap_32)
STRONG_ALIAS(_atomic_swap_ptr,_atomic_swap_32) STRONG_ALIAS(_atomic_swap_ptr,_atomic_swap_32)
#if (!defined(_KERNEL) || defined(_RUMPKERNEL)) && !defined(_STANDALONE) #if (!defined(_KERNEL) || !defined(_RUMPKERNEL)) && !defined(_STANDALONE)
ENTRY_NP(__sync_lock_release_4) ENTRY_NP(__sync_lock_release_4)
mov r1, #0 mov r1, #0
#ifdef _ARM_ARCH_7 #ifdef _ARM_ARCH_7
@ -125,7 +125,7 @@ CRT_ALIAS(__atomic_exchange_1,_atomic_swap_8)
STRONG_ALIAS(_atomic_swap_char,_atomic_swap_8) STRONG_ALIAS(_atomic_swap_char,_atomic_swap_8)
STRONG_ALIAS(_atomic_swap_uchar,_atomic_swap_8) STRONG_ALIAS(_atomic_swap_uchar,_atomic_swap_8)
#if (!defined(_KERNEL) || defined(_RUMPKERNEL)) && !defined(_STANDALONE) #if (!defined(_KERNEL) || !defined(_RUMPKERNEL)) && !defined(_STANDALONE)
ENTRY_NP(__sync_lock_release_1) ENTRY_NP(__sync_lock_release_1)
mov r1, #0 mov r1, #0
#ifdef _ARM_ARCH_7 #ifdef _ARM_ARCH_7

4
common/lib/libc/arch/arm/atomic/atomic_swap_16.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: atomic_swap_16.S,v 1.3 2014/06/28 20:18:55 joerg Exp $ */ /* $NetBSD: atomic_swap_16.S,v 1.4 2015/05/17 20:57:11 justin Exp $ */
/*- /*-
* Copyright (c) 2013 The NetBSD Foundation, Inc. * Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -55,7 +55,7 @@ CRT_ALIAS(__atomic_exchange_2,_atomic_swap_16)
STRONG_ALIAS(_atomic_swap_short,_atomic_swap_16) STRONG_ALIAS(_atomic_swap_short,_atomic_swap_16)
STRONG_ALIAS(_atomic_swap_ushort,_atomic_swap_16) STRONG_ALIAS(_atomic_swap_ushort,_atomic_swap_16)
#if (!defined(_KERNEL) || defined(_RUMPKERNEL)) && !defined(_STANDALONE) #if (!defined(_KERNEL) || !defined(_RUMPKERNEL)) && !defined(_STANDALONE)
ENTRY_NP(__sync_lock_release_2) ENTRY_NP(__sync_lock_release_2)
mov r1, #0 mov r1, #0
strh r1, [r0] strh r1, [r0]

4
common/lib/libc/arch/arm/atomic/atomic_swap_64.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: atomic_swap_64.S,v 1.9 2014/06/28 20:18:55 joerg Exp $ */ /* $NetBSD: atomic_swap_64.S,v 1.10 2015/05/17 20:57:11 justin Exp $ */
/*- /*-
* Copyright (c) 2012 The NetBSD Foundation, Inc. * Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
@ -53,7 +53,7 @@ ATOMIC_OP_ALIAS(atomic_swap_64,_atomic_swap_64)
CRT_ALIAS(__sync_lock_test_and_set_8,_atomic_swap_64) CRT_ALIAS(__sync_lock_test_and_set_8,_atomic_swap_64)
CRT_ALIAS(__atomic_exchange_8,_atomic_swap_64) CRT_ALIAS(__atomic_exchange_8,_atomic_swap_64)
#if (!defined(_KERNEL) || defined(_RUMPKERNEL)) && !defined(_STANDALONE) #if (!defined(_KERNEL) || !defined(_RUMPKERNEL)) && !defined(_STANDALONE)
ENTRY_NP(__sync_lock_release_8) ENTRY_NP(__sync_lock_release_8)
mov r2, #0 mov r2, #0
mov r3, #0 mov r3, #0

4
common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: sync_bool_compare_and_swap_1.S,v 1.1 2013/11/08 22:42:52 matt Exp $ */ /* $NetBSD: sync_bool_compare_and_swap_1.S,v 1.2 2015/05/17 20:57:11 justin Exp $ */
/*- /*-
* Copyright (c) 2013 The NetBSD Foundation, Inc. * Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include "atomic_op_asm.h" #include "atomic_op_asm.h"
#if defined(_ARM_ARCH_6) #if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
/* /*
* ARMv6 has load-exclusive/store-exclusive which works for both user * ARMv6 has load-exclusive/store-exclusive which works for both user
* and kernel. * and kernel.

4
common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: sync_bool_compare_and_swap_2.S,v 1.1 2013/11/08 22:42:52 matt Exp $ */ /* $NetBSD: sync_bool_compare_and_swap_2.S,v 1.2 2015/05/17 20:57:11 justin Exp $ */
/*- /*-
* Copyright (c) 2013 The NetBSD Foundation, Inc. * Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
@ -30,7 +30,7 @@
#include "atomic_op_asm.h" #include "atomic_op_asm.h"
#if defined(_ARM_ARCH_6) #if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
/* /*
* ARMv6 has load-exclusive/store-exclusive which works for both user * ARMv6 has load-exclusive/store-exclusive which works for both user
* and kernel. * and kernel.

4
common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: sync_bool_compare_and_swap_4.S,v 1.1 2013/11/08 22:42:52 matt Exp $ */ /* $NetBSD: sync_bool_compare_and_swap_4.S,v 1.2 2015/05/17 20:57:11 justin Exp $ */
/*- /*-
* Copyright (c) 2008 The NetBSD Foundation, Inc. * Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
@ -30,7 +30,7 @@
#include "atomic_op_asm.h" #include "atomic_op_asm.h"
#if defined(_ARM_ARCH_6) #if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
/* /*
* ARMv6 has load-exclusive/store-exclusive which works for both user * ARMv6 has load-exclusive/store-exclusive which works for both user
* and kernel. * and kernel.

4
common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: sync_bool_compare_and_swap_8.S,v 1.2 2013/11/30 21:09:11 joerg Exp $ */ /* $NetBSD: sync_bool_compare_and_swap_8.S,v 1.3 2015/05/17 20:57:11 justin Exp $ */
/*- /*-
* Copyright (c) 2012 The NetBSD Foundation, Inc. * Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
@ -30,7 +30,7 @@
#include "atomic_op_asm.h" #include "atomic_op_asm.h"
#if defined(_ARM_ARCH_6) #if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
/* /*
* ARMv6 has load-exclusive/store-exclusive which works for both user * ARMv6 has load-exclusive/store-exclusive which works for both user
* and kernel. * and kernel.

4
common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: sync_fetch_and_add_8.S,v 1.3 2014/06/23 21:53:45 joerg Exp $ */ /* $NetBSD: sync_fetch_and_add_8.S,v 1.4 2015/05/17 20:57:11 justin Exp $ */
/*- /*-
* Copyright (c) 2013 The NetBSD Foundation, Inc. * Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include "atomic_op_asm.h" #include "atomic_op_asm.h"
#ifdef _ARM_ARCH_6 #if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
ENTRY_NP(__sync_fetch_and_add_8) ENTRY_NP(__sync_fetch_and_add_8)
push {r4-r7} push {r4-r7}

4
common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: sync_fetch_and_and_8.S,v 1.3 2014/06/23 21:53:45 joerg Exp $ */ /* $NetBSD: sync_fetch_and_and_8.S,v 1.4 2015/05/17 20:57:11 justin Exp $ */
/*- /*-
* Copyright (c) 2013 The NetBSD Foundation, Inc. * Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include "atomic_op_asm.h" #include "atomic_op_asm.h"
#ifdef _ARM_ARCH_6 #if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
ENTRY_NP(__sync_fetch_and_and_8) ENTRY_NP(__sync_fetch_and_and_8)
push {r4-r7} push {r4-r7}

4
common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: sync_fetch_and_nand_8.S,v 1.2 2013/11/30 21:09:11 joerg Exp $ */ /* $NetBSD: sync_fetch_and_nand_8.S,v 1.3 2015/05/17 20:57:11 justin Exp $ */
/*- /*-
* Copyright (c) 2013 The NetBSD Foundation, Inc. * Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include "atomic_op_asm.h" #include "atomic_op_asm.h"
#ifdef _ARM_ARCH_6 #if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
ENTRY_NP(__sync_fetch_and_nand_8) ENTRY_NP(__sync_fetch_and_nand_8)
push {r4-r7} push {r4-r7}

4
common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: sync_fetch_and_or_8.S,v 1.3 2014/06/23 21:53:45 joerg Exp $ */ /* $NetBSD: sync_fetch_and_or_8.S,v 1.4 2015/05/17 20:57:11 justin Exp $ */
/*- /*-
* Copyright (c) 2013 The NetBSD Foundation, Inc. * Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include "atomic_op_asm.h" #include "atomic_op_asm.h"
#ifdef _ARM_ARCH_6 #if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
ENTRY_NP(__sync_fetch_and_or_8) ENTRY_NP(__sync_fetch_and_or_8)
push {r4-r7} push {r4-r7}

4
common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: sync_fetch_and_sub_8.S,v 1.3 2014/06/23 21:53:45 joerg Exp $ */ /* $NetBSD: sync_fetch_and_sub_8.S,v 1.4 2015/05/17 20:57:11 justin Exp $ */
/*- /*-
* Copyright (c) 2013 The NetBSD Foundation, Inc. * Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include "atomic_op_asm.h" #include "atomic_op_asm.h"
#ifdef _ARM_ARCH_6 #if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
ENTRY_NP(__sync_fetch_and_sub_8) ENTRY_NP(__sync_fetch_and_sub_8)
push {r4-r7} push {r4-r7}

4
common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: sync_fetch_and_xor_8.S,v 1.3 2014/06/23 21:53:45 joerg Exp $ */ /* $NetBSD: sync_fetch_and_xor_8.S,v 1.4 2015/05/17 20:57:11 justin Exp $ */
/*- /*-
* Copyright (c) 2013 The NetBSD Foundation, Inc. * Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include "atomic_op_asm.h" #include "atomic_op_asm.h"
#ifdef _ARM_ARCH_6 #if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
ENTRY_NP(__sync_fetch_and_xor_8) ENTRY_NP(__sync_fetch_and_xor_8)
push {r4-r7} push {r4-r7}

6
common/lib/libc/arch/arm/string/ffs.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs.S,v 1.7 2014/01/23 11:45:46 martin Exp $ */ /* $NetBSD: ffs.S,v 1.8 2015/05/17 20:57:12 justin Exp $ */
/* /*
* Copyright (c) 2001 Christopher Gilbert * Copyright (c) 2001 Christopher Gilbert
* All rights reserved. * All rights reserved.
@ -30,7 +30,7 @@
#include <machine/asm.h> #include <machine/asm.h>
RCSID("$NetBSD: ffs.S,v 1.7 2014/01/23 11:45:46 martin Exp $") RCSID("$NetBSD: ffs.S,v 1.8 2015/05/17 20:57:12 justin Exp $")
/* /*
* ffs - find first set bit, this algorithm isolates the first set * ffs - find first set bit, this algorithm isolates the first set
@ -44,6 +44,7 @@ RCSID("$NetBSD: ffs.S,v 1.7 2014/01/23 11:45:46 martin Exp $")
* This is the ffs algorithm devised by d.seal and posted to comp.sys.arm on * This is the ffs algorithm devised by d.seal and posted to comp.sys.arm on
* 16 Feb 1994. * 16 Feb 1994.
*/ */
#ifndef _RUMPKERNEL
STRONG_ALIAS(__ffssi2,ffs) STRONG_ALIAS(__ffssi2,ffs)
#if (defined(_ARM_ARCH_5) && !defined(__thumb__)) || defined(_ARM_ARCH_T2) #if (defined(_ARM_ARCH_5) && !defined(__thumb__)) || defined(_ARM_ARCH_T2)
#if defined(_ARM_ARCH_T2) #if defined(_ARM_ARCH_T2)
@ -90,3 +91,4 @@ ARM_ENTRY(ffs)
.byte 30, 0, 23, 19, 29, 18, 17, 0 /* 56-63 */ .byte 30, 0, 23, 19, 29, 18, 17, 0 /* 56-63 */
END(ffs) END(ffs)
#endif #endif
#endif /* _RUMPKERNEL */