diff options
| author | Daniel Jacobowitz <dan@codesourcery.com> | 2005-11-04 14:51:20 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@gcc.gnu.org> | 2005-11-04 14:51:20 +0000 |
| commit | 802b34612cc1c7176de9de21c4183ce4db22e4cb (patch) | |
| tree | a28603023ec39ac71341399247a92265c0d9be8d /gcc/config | |
| parent | aab384ae9af4eaa4110a9f5d0a54c2fcac194441 (diff) | |
| download | gcc-802b34612cc1c7176de9de21c4183ce4db22e4cb.zip gcc-802b34612cc1c7176de9de21c4183ce4db22e4cb.tar.gz gcc-802b34612cc1c7176de9de21c4183ce4db22e4cb.tar.bz2 | |
lib1funcs.asm: Don't include "libunwind.S".
* config/arm/lib1funcs.asm: Don't include "libunwind.S".
* config/arm/libunwind.S: Include "lib1funcs.asm".
* config/arm/t-bpabi (LIB1ASMFUNCS): Remove _unwind.
(LIB2ADDEH): Add libunwind.S.
(LIB2ADDEHDEP): Add lib1funcs.asm.
* mklibgcc.in: Handle asm files in libgcc_eh.a.
From-SVN: r106488
Diffstat (limited to 'gcc/config')
| -rw-r--r-- | gcc/config/arm/lib1funcs.asm | 1 | ||||
| -rw-r--r-- | gcc/config/arm/libunwind.S | 8 | ||||
| -rw-r--r-- | gcc/config/arm/t-bpabi | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/gcc/config/arm/lib1funcs.asm b/gcc/config/arm/lib1funcs.asm index 952eb56..364d9fe 100644 --- a/gcc/config/arm/lib1funcs.asm +++ b/gcc/config/arm/lib1funcs.asm @@ -1315,5 +1315,4 @@ LSYM(Lchange_\register): #include "ieee754-df.S" #include "ieee754-sf.S" #include "bpabi.S" -#include "libunwind.S" #endif /* __symbian__ */ diff --git a/gcc/config/arm/libunwind.S b/gcc/config/arm/libunwind.S index 96044f8..8d226df 100644 --- a/gcc/config/arm/libunwind.S +++ b/gcc/config/arm/libunwind.S @@ -1,5 +1,5 @@ /* Support functions for the unwinder. - Copyright (C) 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. Contributed by Paul Brook This file is free software; you can redistribute it and/or modify it @@ -26,7 +26,9 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef L_unwind +#ifndef __symbian__ + +#include "lib1funcs.asm" .macro UNPREFIX name .global SYM (\name) @@ -113,4 +115,4 @@ ARM_FUNC_START gnu_Unwind_Save_VFP UNWIND_WRAPPER _Unwind_RaiseException UNWIND_WRAPPER _Unwind_Resume -#endif /* L_unwind */ +#endif /* __symbian__ */ diff --git a/gcc/config/arm/t-bpabi b/gcc/config/arm/t-bpabi index 3498107..b5c6a0b 100644 --- a/gcc/config/arm/t-bpabi +++ b/gcc/config/arm/t-bpabi @@ -1,6 +1,5 @@ # Add the bpabi.S functions. -LIB1ASMFUNCS += _aeabi_lcmp _aeabi_ulcmp _aeabi_ldivmod _aeabi_uldivmod \ - _unwind +LIB1ASMFUNCS += _aeabi_lcmp _aeabi_ulcmp _aeabi_ldivmod _aeabi_uldivmod # Add the BPABI C functions. LIB2FUNCS_EXTRA = $(srcdir)/config/arm/bpabi.c \ @@ -8,8 +7,9 @@ LIB2FUNCS_EXTRA = $(srcdir)/config/arm/bpabi.c \ UNWIND_H = $(srcdir)/config/arm/unwind-arm.h LIB2ADDEH = $(srcdir)/config/arm/unwind-arm.c \ + $(srcdir)/config/arm/libunwind.S \ $(srcdir)/config/arm/pr-support.c $(srcdir)/unwind-c.c -LIB2ADDEHDEP = $(UNWIND_H) +LIB2ADDEHDEP = $(UNWIND_H) $(srcdir)/config/$(LIB1ASMSRC) # Add the BPABI names. SHLIB_MAPFILES += $(srcdir)/config/arm/libgcc-bpabi.ver |