yann@1: # See http://gcc.gnu.org/PR7383, http://www.kegel.com/xgcc3/ppc405erratum77.html yann@1: # Fixed in gcc-3.3 yann@1: yann@1: diff -aur gcc-20020722.orig/gcc/config/rs6000/rs6000.h gcc-20020722/gcc/config/rs6000/rs6000.h yann@1: --- gcc-20020722.orig/gcc/config/rs6000/rs6000.h Thu Jul 25 09:32:21 2002 yann@1: +++ gcc-20020722/gcc/config/rs6000/rs6000.h Thu Jul 25 09:34:45 2002 yann@1: @@ -66,7 +66,7 @@ yann@1: %{mcpu=rsc1: -D_ARCH_PWR} \ yann@1: %{mcpu=401: -D_ARCH_PPC} \ yann@1: %{mcpu=403: -D_ARCH_PPC} \ yann@1: -%{mcpu=405: -D_ARCH_PPC} \ yann@1: +%{mcpu=405: -D_ARCH_PPC -D__PPC405__} \ yann@1: %{mcpu=505: -D_ARCH_PPC} \ yann@1: %{mcpu=601: -D_ARCH_PPC -D_ARCH_PWR} \ yann@1: %{mcpu=602: -D_ARCH_PPC} \ yann@1: diff -aur gcc-20020722.orig/libjava/sysdep/powerpc/locks.h gcc-20020722/libjava/sysdep/powerpc/locks.h yann@1: --- gcc-20020722.orig/libjava/sysdep/powerpc/locks.h Thu Jul 25 09:32:30 2002 yann@1: +++ gcc-20020722/libjava/sysdep/powerpc/locks.h Thu Jul 25 11:39:13 2002 yann@1: @@ -11,6 +11,17 @@ yann@1: #ifndef __SYSDEP_LOCKS_H__ yann@1: #define __SYSDEP_LOCKS_H__ yann@1: yann@1: +#ifdef __PPC405__ yann@1: +// workaround for PPC405 erratum #77 - 07/18/02 JRO, dank, NN. References: yann@1: +// http://www-3.ibm.com/chips/techlib/techlib.nsf/techdocs/89DED00DEBFF54BF87256A8000491BA2/$file/405CR_C_errata_1_2.pdf yann@1: +// http://ppc.bkbits.net:8080/linuxppc_2_4_devel/cset@1.489 yann@1: +// http://www.kegel.com/xgcc3/ppc405erratum77.html yann@1: +// FIXME: using dbct instead of sync would be faster yann@1: +#define __LIBGCJ_PPC405_ERR77_SYNC "sync \n\t" yann@1: +#else yann@1: +#define __LIBGCJ_PPC405_ERR77_SYNC yann@1: +#endif yann@1: + yann@1: typedef size_t obj_addr_t; /* Integer type big enough for object */ yann@1: /* address. */ yann@1: yann@1: @@ -25,6 +36,7 @@ yann@1: "0: lwarx %0,0,%1 ;" yann@1: " xor. %0,%3,%0;" yann@1: " bne 1f;" yann@1: + __LIBGCJ_PPC405_ERR77_SYNC yann@1: " stwcx. %2,0,%1;" yann@1: " bne- 0b;" yann@1: "1: " yann@1: @@ -58,6 +70,7 @@ yann@1: "0: lwarx %0,0,%1 ;" yann@1: " xor. %0,%3,%0;" yann@1: " bne 1f;" yann@1: + __LIBGCJ_PPC405_ERR77_SYNC yann@1: " stwcx. %2,0,%1;" yann@1: " bne- 0b;" yann@1: "1: " yann@1: diff -aur gcc-20020722.orig/libstdc++-v3/config/cpu/powerpc/bits/atomicity.h gcc-20020722/libstdc++-v3/config/cpu/powerpc/bits/atomicity.h yann@1: --- gcc-20020722.orig/libstdc++-v3/config/cpu/powerpc/bits/atomicity.h Thu Jul 25 09:32:31 2002 yann@1: +++ gcc-20020722/libstdc++-v3/config/cpu/powerpc/bits/atomicity.h Thu Jul 25 09:34:45 2002 yann@1: @@ -32,6 +32,17 @@ yann@1: yann@1: typedef int _Atomic_word; yann@1: yann@1: +#ifdef __PPC405__ yann@1: +// workaround for PPC405 erratum #77 - 07/18/02 JRO & dank. References: yann@1: +// http://www-3.ibm.com/chips/techlib/techlib.nsf/techdocs/89DED00DEBFF54BF87256A8000491BA2/$file/405CR_C_errata_1_2.pdf yann@1: +// http://ppc.bkbits.net:8080/linuxppc_2_4_devel/cset@1.489 yann@1: +// http://www.kegel.com/xgcc3/ppc405erratum77.html yann@1: +// FIXME: using dbct instead of sync would be faster yann@1: +#define __LIBSTDCPP_PPC405_ERR77_SYNC "sync \n\t" yann@1: +#else yann@1: +#define __LIBSTDCPP_PPC405_ERR77_SYNC yann@1: +#endif yann@1: + yann@1: static inline _Atomic_word yann@1: __attribute__ ((__unused__)) yann@1: __exchange_and_add (volatile _Atomic_word* __mem, int __val) yann@1: @@ -42,6 +53,7 @@ yann@1: "0:\t" yann@1: "lwarx %0,0,%2 \n\t" yann@1: "add%I3 %1,%0,%3 \n\t" yann@1: + __LIBSTDCPP_PPC405_ERR77_SYNC yann@1: "stwcx. %1,0,%2 \n\t" yann@1: "bne- 0b \n\t" yann@1: "/* End exchange & add */" yann@1: @@ -61,6 +73,7 @@ yann@1: "0:\t" yann@1: "lwarx %0,0,%1 \n\t" yann@1: "add%I2 %0,%0,%2 \n\t" yann@1: + __LIBSTDCPP_PPC405_ERR77_SYNC yann@1: "stwcx. %0,0,%1 \n\t" yann@1: "bne- 0b \n\t" yann@1: "/* End atomic add */" yann@1: @@ -78,6 +91,7 @@ yann@1: "/* Inline always swap */\n" yann@1: "0:\t" yann@1: "lwarx %0,0,%1 \n\t" yann@1: + __LIBSTDCPP_PPC405_ERR77_SYNC yann@1: "stwcx. %2,0,%1 \n\t" yann@1: "bne- 0b \n\t" yann@1: "/* End always swap */" yann@1: @@ -98,6 +112,7 @@ yann@1: "lwarx %0,0,%1 \n\t" yann@1: "cmpwi %0,0 \n\t" yann@1: "bne- 1f \n\t" yann@1: + __LIBSTDCPP_PPC405_ERR77_SYNC yann@1: "stwcx. %2,0,%1 \n\t" yann@1: "bne- 0b \n" yann@1: "1:\n\t"