|
yann@1
|
1 |
Retrieved with
|
|
yann@1
|
2 |
wget 'http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/sh/dl-machine.h.diff?r1=1.21&r2=1.22&cvsroot=glibc'
|
|
yann@1
|
3 |
|
|
yann@1
|
4 |
Fixes error
|
|
yann@1
|
5 |
/tmp/ccFobT8r.s: Assembler messages:
|
|
yann@1
|
6 |
/tmp/ccFobT8r.s:1819: Error: symbol `.L3' is already defined
|
|
yann@1
|
7 |
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
|
|
yann@1
|
8 |
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'
|
|
yann@1
|
9 |
|
|
yann@1
|
10 |
See also http://sources.redhat.com/ml/libc-alpha/2002-07/msg00001.html
|
|
yann@1
|
11 |
|
|
yann@1
|
12 |
===================================================================
|
|
yann@1
|
13 |
RCS file: /cvs/glibc/libc/sysdeps/sh/dl-machine.h,v
|
|
yann@1
|
14 |
retrieving revision 1.21
|
|
yann@1
|
15 |
retrieving revision 1.22
|
|
yann@1
|
16 |
diff -u -r1.21 -r1.22
|
|
yann@1
|
17 |
--- libc/sysdeps/sh/dl-machine.h 2002/04/08 20:59:36 1.21
|
|
yann@1
|
18 |
+++ libc/sysdeps/sh/dl-machine.h 2002/06/28 17:26:01 1.22
|
|
yann@1
|
19 |
@@ -53,16 +53,16 @@
|
|
yann@1
|
20 |
elf_machine_load_address (void)
|
|
yann@1
|
21 |
{
|
|
yann@1
|
22 |
Elf32_Addr addr;
|
|
yann@1
|
23 |
- asm ("mov.l .L1,r0\n\
|
|
yann@1
|
24 |
- mov.l .L3,r2\n\
|
|
yann@1
|
25 |
+ asm ("mov.l 1f,r0\n\
|
|
yann@1
|
26 |
+ mov.l 3f,r2\n\
|
|
yann@1
|
27 |
add r12,r2\n\
|
|
yann@1
|
28 |
mov.l @(r0,r12),r0\n\
|
|
yann@1
|
29 |
- bra .L2\n\
|
|
yann@1
|
30 |
+ bra 2f\n\
|
|
yann@1
|
31 |
sub r0,r2\n\
|
|
yann@1
|
32 |
.align 2\n\
|
|
yann@1
|
33 |
- .L1: .long _dl_start@GOT\n\
|
|
yann@1
|
34 |
- .L3: .long _dl_start@GOTOFF\n\
|
|
yann@1
|
35 |
- .L2: mov r2,%0"
|
|
yann@1
|
36 |
+ 1: .long _dl_start@GOT\n\
|
|
yann@1
|
37 |
+ 3: .long _dl_start@GOTOFF\n\
|
|
yann@1
|
38 |
+ 2: mov r2,%0"
|
|
yann@1
|
39 |
: "=r" (addr) : : "r0", "r1", "r2");
|
|
yann@1
|
40 |
return addr;
|
|
yann@1
|
41 |
}
|