1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/glibc/2.2.5/dl-machine-sh.patch Thu May 24 17:50:07 2007 +0000
1.3 @@ -0,0 +1,41 @@
1.4 +Retrieved with
1.5 +wget 'http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/sh/dl-machine.h.diff?r1=1.21&r2=1.22&cvsroot=glibc'
1.6 +
1.7 +Fixes error
1.8 +/tmp/ccFobT8r.s: Assembler messages:
1.9 +/tmp/ccFobT8r.s:1819: Error: symbol `.L3' is already defined
1.10 +make[2]: *** [/home/dank/wk/crosstool-0.28-rc24/build/sh4-unknown-linux-gnu/gcc-3.4.0-glibc-2.2.5/build-glibc/elf/rtld.os] Error 1
1.11 +make[2]: Leaving directory `/home/dank/wk/crosstool-0.28-rc24/build/sh4-unknown-linux-gnu/gcc-3.4.0-glibc-2.2.5/glibc-2.2.5/elf'
1.12 +
1.13 +See also http://sources.redhat.com/ml/libc-alpha/2002-07/msg00001.html
1.14 +
1.15 +===================================================================
1.16 +RCS file: /cvs/glibc/libc/sysdeps/sh/dl-machine.h,v
1.17 +retrieving revision 1.21
1.18 +retrieving revision 1.22
1.19 +diff -u -r1.21 -r1.22
1.20 +--- libc/sysdeps/sh/dl-machine.h 2002/04/08 20:59:36 1.21
1.21 ++++ libc/sysdeps/sh/dl-machine.h 2002/06/28 17:26:01 1.22
1.22 +@@ -53,16 +53,16 @@
1.23 + elf_machine_load_address (void)
1.24 + {
1.25 + Elf32_Addr addr;
1.26 +- asm ("mov.l .L1,r0\n\
1.27 +- mov.l .L3,r2\n\
1.28 ++ asm ("mov.l 1f,r0\n\
1.29 ++ mov.l 3f,r2\n\
1.30 + add r12,r2\n\
1.31 + mov.l @(r0,r12),r0\n\
1.32 +- bra .L2\n\
1.33 ++ bra 2f\n\
1.34 + sub r0,r2\n\
1.35 + .align 2\n\
1.36 +- .L1: .long _dl_start@GOT\n\
1.37 +- .L3: .long _dl_start@GOTOFF\n\
1.38 +- .L2: mov r2,%0"
1.39 ++ 1: .long _dl_start@GOT\n\
1.40 ++ 3: .long _dl_start@GOTOFF\n\
1.41 ++ 2: mov r2,%0"
1.42 + : "=r" (addr) : : "r0", "r1", "r2");
1.43 + return addr;
1.44 + }