From c0354bf4f65ca239a247d155b87c7f02a45c9e6f Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Wed, 18 Jan 2006 20:39:17 +0000 Subject: [multiple changes] 2006-01-18 Paul Brook Merge from csl-arm-branch. 2005-03-14 Julian Brown * config/arm/lib1funcs.asm (ashldi3): Don't define on SymbianOS. (aeabi_llsl): Likewise. (ashrdi3): Likewise. (aeabi_lasr): Likewise. (lshrdi3): Likewise. (aeabi_llsr): Likewise. 2005-03-10 Julian Brown * config.gcc: Disable shared libgcc for SymbianOS. * config/arm/t-symbian (LIB2ADDEH): Include config/arm/pr-support.c. From-SVN: r109911 --- gcc/ChangeLog | 14 ++++++++++++++ gcc/config.gcc | 2 +- gcc/config/arm/lib1funcs.asm | 5 +++++ gcc/config/arm/t-symbian | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cd3a907..bae9ffa 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,17 @@ +2006-01-18 Paul Brook + + Merge from csl-arm-branch. + 2005-03-14 Julian Brown + * config/arm/lib1funcs.asm (ashldi3): Don't define on SymbianOS. + (aeabi_llsl): Likewise. + (ashrdi3): Likewise. + (aeabi_lasr): Likewise. + (lshrdi3): Likewise. + (aeabi_llsr): Likewise. + 2005-03-10 Julian Brown + * config.gcc: Disable shared libgcc for SymbianOS. + * config/arm/t-symbian (LIB2ADDEH): Include config/arm/pr-support.c. + 2006-01-18 DJ Delorie * c-pragma.c (handle_pragma_diagnostic): New. diff --git a/gcc/config.gcc b/gcc/config.gcc index 6e29abb..076e715 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -714,7 +714,7 @@ arm*-*-eabi* | arm*-*-symbianelf* ) tm_file="${tm_file} arm/symbian.h" # We do not include t-bpabi for Symbian OS because the system # provides its own implementation of the BPABI functions. - tmake_file="${tmake_file} t-slibgcc-elf-ver arm/t-symbian" + tmake_file="${tmake_file} arm/t-symbian" ;; esac tm_file="${tm_file} arm/aout.h arm/arm.h" diff --git a/gcc/config/arm/lib1funcs.asm b/gcc/config/arm/lib1funcs.asm index 8494a97..9245b3c 100644 --- a/gcc/config/arm/lib1funcs.asm +++ b/gcc/config/arm/lib1funcs.asm @@ -1020,6 +1020,9 @@ LSYM(Lover12): #define ah r1 #endif +/* Prevent __aeabi double-word shifts from being produced on SymbianOS. */ +#ifndef __symbian__ + #ifdef L_lshrdi3 FUNC_START lshrdi3 @@ -1121,6 +1124,8 @@ LSYM(Lover12): #endif +#endif /* __symbian__ */ + /* ------------------------------------------------------------------------ */ /* These next two sections are here despite the fact that they contain Thumb assembler because their presence allows interworked code to be linked even diff --git a/gcc/config/arm/t-symbian b/gcc/config/arm/t-symbian index 8f72b3e..db89138 100644 --- a/gcc/config/arm/t-symbian +++ b/gcc/config/arm/t-symbian @@ -14,7 +14,7 @@ LIB1ASMFUNCS += \ # Include the gcc personality routine UNWIND_H = $(srcdir)/config/arm/unwind-arm.h -LIB2ADDEH = $(srcdir)/unwind-c.c +LIB2ADDEH = $(srcdir)/unwind-c.c $(srcdir)/config/arm/pr-support.c LIB2ADDEHDEP = $(UNWIND_H) # Create a multilib for processors with VFP floating-point, and a -- cgit v1.1