1 |
vapier 10/09/30 00:03:25 |
2 |
|
3 |
Modified: README.history |
4 |
Added: 6230_all_arm-glibc-hardened.patch |
5 |
Log: |
6 |
fix by David Lamparter for building on hardened/arm systems #336914 |
7 |
|
8 |
Revision Changes Path |
9 |
1.11 src/patchsets/glibc/2.11.2/README.history |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.11.2/README.history?rev=1.11&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.11.2/README.history?rev=1.11&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.11.2/README.history?r1=1.10&r2=1.11 |
14 |
|
15 |
Index: README.history |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.11.2/README.history,v |
18 |
retrieving revision 1.10 |
19 |
retrieving revision 1.11 |
20 |
diff -u -r1.10 -r1.11 |
21 |
--- README.history 29 Sep 2010 23:54:54 -0000 1.10 |
22 |
+++ README.history 30 Sep 2010 00:03:25 -0000 1.11 |
23 |
@@ -7,6 +7,7 @@ |
24 |
+ 6029_all_alpha-fix-memchr.patch |
25 |
R 6028_all_alpha-fix-SOCK_NONBLOCK.patch -> 6030_all_alpha-fix-SOCK_NONBLOCK.patch |
26 |
+ 6031_all_sparc-glibc-2.12-epoll_create1.patch |
27 |
+ + 6230_all_arm-glibc-hardened.patch |
28 |
+ 6531_all_sparc-glibc-2.12-epoll_create1.patch |
29 |
|
30 |
3 26.07.2010 |
31 |
|
32 |
|
33 |
|
34 |
1.1 src/patchsets/glibc/2.11.2/6230_all_arm-glibc-hardened.patch |
35 |
|
36 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.11.2/6230_all_arm-glibc-hardened.patch?rev=1.1&view=markup |
37 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.11.2/6230_all_arm-glibc-hardened.patch?rev=1.1&content-type=text/plain |
38 |
|
39 |
Index: 6230_all_arm-glibc-hardened.patch |
40 |
=================================================================== |
41 |
patch by David Lamparter to fix build errors for hardened/arm systems. |
42 |
the logic in setjmp/__longjmp incorrectly tie to "PIC" to figure out |
43 |
whether the code is going into a shared library when it should be using |
44 |
"SHARED". otherwise, building static PIC code goes wrong. |
45 |
|
46 |
https://bugs.gentoo.org/336914 |
47 |
|
48 |
--- ports/sysdeps/arm/eabi/setjmp.S |
49 |
+++ ports/sysdeps/arm/eabi/setjmp.S |
50 |
@@ -37,7 +37,7 @@ |
51 |
add a3, a3, a4 |
52 |
ldr a3, [a3, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET] |
53 |
#else |
54 |
-#ifdef PIC |
55 |
+#ifdef SHARED |
56 |
ldr a3, 1f |
57 |
ldr a4, Lrtld_global_ro |
58 |
0: add a3, pc, a3 |
59 |
@@ -84,7 +84,7 @@ |
60 |
Lrtld_local_ro: |
61 |
.long C_SYMBOL_NAME(_rtld_local_ro)(GOTOFF) |
62 |
#else |
63 |
-#ifdef PIC |
64 |
+#ifdef SHARED |
65 |
1: .long _GLOBAL_OFFSET_TABLE_ - 0b - 8 |
66 |
Lrtld_global_ro: |
67 |
.long C_SYMBOL_NAME(_rtld_global_ro)(GOT) |
68 |
--- ports/sysdeps/arm/eabi/__longjmp.S |
69 |
+++ ports/sysdeps/arm/eabi/__longjmp.S |
70 |
@@ -43,7 +43,7 @@ |
71 |
add a2, a2, a3 |
72 |
ldr a2, [a2, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET] |
73 |
#else |
74 |
-#ifdef PIC |
75 |
+#ifdef SHARED |
76 |
ldr a2, 1f |
77 |
ldr a3, Lrtld_global_ro |
78 |
0: add a2, pc, a2 |
79 |
@@ -87,7 +87,7 @@ |
80 |
Lrtld_local_ro: |
81 |
.long C_SYMBOL_NAME(_rtld_local_ro)(GOTOFF) |
82 |
#else |
83 |
-#ifdef PIC |
84 |
+#ifdef SHARED |
85 |
1: .long _GLOBAL_OFFSET_TABLE_ - 0b - 8 |
86 |
Lrtld_global_ro: |
87 |
.long C_SYMBOL_NAME(_rtld_global_ro)(GOT) |