d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the __aeabi_unwind_cpp_pr{0,1,2} functions to libkern so they can be

Browse Source 
referenced in a non-debug kernel.
This commit is contained in:
Andrew Turner 2013-03-16 04:06:49 +00:00
parent 2ecc0d987b
commit 5cc8d54ca0
3 changed files with 59 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/arm/arm/db_trace.c
View File

@ -126,29 +126,6 @@ struct unwind_state {
uint16_t update_mask;
};
/* We need to provide these but never use them */
void __aeabi_unwind_cpp_pr0(void);
void __aeabi_unwind_cpp_pr1(void);
void __aeabi_unwind_cpp_pr2(void);
void
__aeabi_unwind_cpp_pr0(void)
{
panic("__aeabi_unwind_cpp_pr0");
}
void
__aeabi_unwind_cpp_pr1(void)
{
panic("__aeabi_unwind_cpp_pr1");
}
void
__aeabi_unwind_cpp_pr2(void)
{
panic("__aeabi_unwind_cpp_pr2");
}
/* Expand a 31-bit signed value to a 32-bit signed value */
static __inline int32_t
db_expand_prel31(uint32_t prel31)

1
sys/conf/files.arm
View File

@ -72,6 +72,7 @@ font.h optional sc \
clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
kern/subr_busdma_bufalloc.c standard
kern/subr_dummy_vdso_tc.c standard
libkern/arm/aeabi_unwind.c standard
libkern/arm/divsi3.S standard
libkern/arm/ffs.S standard
libkern/arm/ldivmod.S standard

58
sys/libkern/arm/aeabi_unwind.c Normal file
View File

@ -0,0 +1,58 @@
/*
* Copyright (C) 2013 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 <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/systm.h>
#ifdef __ARM_EABI__
/* We need to provide these functions never call them */
void __aeabi_unwind_cpp_pr0(void);
void __aeabi_unwind_cpp_pr1(void);
void __aeabi_unwind_cpp_pr2(void);
void
__aeabi_unwind_cpp_pr0(void)
{
panic("__aeabi_unwind_cpp_pr0");
}
void
__aeabi_unwind_cpp_pr1(void)
{
panic("__aeabi_unwind_cpp_pr1");
}
void
__aeabi_unwind_cpp_pr2(void)
{
panic("__aeabi_unwind_cpp_pr2");
}
#endif