[multiple changes]

2006-01-18  Paul Brook  <paul@codesourcery.com>

	Merge from csl-arm-branch.
	2005-03-14  Julian Brown  <julian@codesourcery.com>
	* 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  <julian@codesourcery.com>
	* config.gcc: Disable shared libgcc for SymbianOS.
	* config/arm/t-symbian (LIB2ADDEH): Include config/arm/pr-support.c.

From-SVN: r109911

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cd3a907bda6253dedc867d9265519e6c45bb9e47..bae9ffa1089d19c59dba73fd1a64fb15bf43a6cf 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2006-01-18  Paul Brook  <paul@codesourcery.com>
+
+       Merge from csl-arm-branch.
+       2005-03-14  Julian Brown  <julian@codesourcery.com>
+       * 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  <julian@codesourcery.com>
+       * config.gcc: Disable shared libgcc for SymbianOS.
+       * config/arm/t-symbian (LIB2ADDEH): Include config/arm/pr-support.c.
+
 2006-01-18  DJ Delorie  <dj@redhat.com>
 
        * c-pragma.c (handle_pragma_diagnostic): New.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 6e29abb998b749b5408be0abc34b071347bc110f..076e71541f4e6c1f9eec80be2765f2a76d6924e9 100644 (file)
--- 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 8494a973bfa6d4947f7acfc8c0f33f36ff977e02..9245b3ca0c0d281afe5ff136746ac8db4addf1fc 100644 (file)
--- 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 8f72b3ea89d469a2b425cbcf5cfd8462e7ba7327..db8913818286ae8eddcd1db53e7c892a5926431f 100644 (file)
--- 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