diff options
Diffstat (limited to 'meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch')
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch | 192 |
1 files changed, 93 insertions, 99 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch b/meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch index faf2985140..dfbcd45bea 100644 --- a/meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch +++ b/meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch | |||
@@ -1,8 +1,9 @@ | |||
1 | From 9ba002f1b1afc7af84a352f4ecab32a30d7ba353 Mon Sep 17 00:00:00 2001 | 1 | From 92598e1515b2ec3851af1f064075d0457f01272d Mon Sep 17 00:00:00 2001 |
2 | From: Zhenhua Luo <zhenhua.luo@freescale.com> | 2 | From: Zhenhua Luo <zhenhua.luo@freescale.com> |
3 | Date: Mon, 9 Feb 2015 18:33:56 +0800 | 3 | Date: Mon, 9 Feb 2015 18:33:56 +0800 |
4 | Subject: [PATCH] powerpc/cpu/*/u-boot*.lds: remove _GLOBAL_OFFSET_TABLE_ | 4 | Subject: [PATCH] powerpc/cpu/*/u-boot*.lds: remove _GLOBAL_OFFSET_TABLE_ |
5 | definition | 5 | definition |
6 | Organization: O.S. Systems Software LTDA. | ||
6 | 7 | ||
7 | In binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbols defined by PROVIDE in | 8 | In binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbols defined by PROVIDE in |
8 | u-boot.lds overrides the linker built-in symbols | 9 | u-boot.lds overrides the linker built-in symbols |
@@ -19,48 +20,38 @@ Fixed the following build errors with binutils-2.25: | |||
19 | Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> | 20 | Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> |
20 | 21 | ||
21 | Upstream-Status: Pending | 22 | Upstream-Status: Pending |
23 | --- | ||
24 | arch/powerpc/cpu/mpc512x/u-boot.lds | 1 - | ||
25 | arch/powerpc/cpu/mpc5xx/u-boot.lds | 1 - | ||
26 | arch/powerpc/cpu/mpc5xxx/u-boot.lds | 1 - | ||
27 | arch/powerpc/cpu/mpc8260/u-boot.lds | 1 - | ||
28 | arch/powerpc/cpu/mpc83xx/u-boot-spl.lds | 1 - | ||
29 | arch/powerpc/cpu/mpc83xx/u-boot.lds | 1 - | ||
30 | arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 1 - | ||
31 | arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 1 - | ||
32 | arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 1 - | ||
33 | arch/powerpc/cpu/mpc85xx/u-boot.lds | 1 - | ||
34 | arch/powerpc/cpu/mpc86xx/u-boot.lds | 1 - | ||
35 | arch/powerpc/cpu/ppc4xx/u-boot.lds | 1 - | ||
36 | 12 files changed, 12 deletions(-) | ||
22 | 37 | ||
23 | Index: git/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 38 | diff --git a/arch/powerpc/cpu/mpc512x/u-boot.lds b/arch/powerpc/cpu/mpc512x/u-boot.lds |
24 | =================================================================== | 39 | index 9658b21..b32f74e 100644 |
25 | --- git.orig/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 40 | --- a/arch/powerpc/cpu/mpc512x/u-boot.lds |
26 | +++ git/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 41 | +++ b/arch/powerpc/cpu/mpc512x/u-boot.lds |
27 | @@ -44,7 +44,6 @@ SECTIONS | 42 | @@ -24,7 +24,6 @@ SECTIONS |
28 | _GOT2_TABLE_ = .; | 43 | _GOT2_TABLE_ = .; |
29 | KEEP(*(.got2)) | 44 | KEEP(*(.got2)) |
30 | KEEP(*(.got)) | 45 | KEEP(*(.got)) |
31 | - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); | 46 | - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); |
32 | _FIXUP_TABLE_ = .; | 47 | _FIXUP_TABLE_ = .; |
33 | KEEP(*(.fixup)) | 48 | KEEP(*(.fixup)) |
34 | } | 49 | *(.fixup) |
35 | Index: git/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 50 | diff --git a/arch/powerpc/cpu/mpc5xx/u-boot.lds b/arch/powerpc/cpu/mpc5xx/u-boot.lds |
36 | =================================================================== | 51 | index 7198465..6a53571 100644 |
37 | --- git.orig/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 52 | --- a/arch/powerpc/cpu/mpc5xx/u-boot.lds |
38 | +++ git/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 53 | +++ b/arch/powerpc/cpu/mpc5xx/u-boot.lds |
39 | @@ -22,7 +22,6 @@ SECTIONS | 54 | @@ -33,7 +33,6 @@ SECTIONS |
40 | _GOT2_TABLE_ = .; | ||
41 | KEEP(*(.got2)) | ||
42 | KEEP(*(.got)) | ||
43 | - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); | ||
44 | _FIXUP_TABLE_ = .; | ||
45 | KEEP(*(.fixup)) | ||
46 | } | ||
47 | Index: git/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | ||
48 | =================================================================== | ||
49 | --- git.orig/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | ||
50 | +++ git/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | ||
51 | @@ -29,7 +29,6 @@ SECTIONS | ||
52 | _GOT2_TABLE_ = .; | ||
53 | KEEP(*(.got2)) | ||
54 | KEEP(*(.got)) | ||
55 | - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); | ||
56 | _FIXUP_TABLE_ = .; | ||
57 | KEEP(*(.fixup)) | ||
58 | } | ||
59 | Index: git/arch/powerpc/cpu/mpc85xx/u-boot.lds | ||
60 | =================================================================== | ||
61 | --- git.orig/arch/powerpc/cpu/mpc85xx/u-boot.lds | ||
62 | +++ git/arch/powerpc/cpu/mpc85xx/u-boot.lds | ||
63 | @@ -50,7 +50,6 @@ SECTIONS | ||
64 | _GOT2_TABLE_ = .; | 55 | _GOT2_TABLE_ = .; |
65 | KEEP(*(.got2)) | 56 | KEEP(*(.got2)) |
66 | KEEP(*(.got)) | 57 | KEEP(*(.got)) |
@@ -68,11 +59,11 @@ Index: git/arch/powerpc/cpu/mpc85xx/u-boot.lds | |||
68 | _FIXUP_TABLE_ = .; | 59 | _FIXUP_TABLE_ = .; |
69 | KEEP(*(.fixup)) | 60 | KEEP(*(.fixup)) |
70 | } | 61 | } |
71 | Index: git/arch/powerpc/cpu/mpc8260/u-boot.lds | 62 | diff --git a/arch/powerpc/cpu/mpc5xxx/u-boot.lds b/arch/powerpc/cpu/mpc5xxx/u-boot.lds |
72 | =================================================================== | 63 | index cd9e23f..aa80d3d 100644 |
73 | --- git.orig/arch/powerpc/cpu/mpc8260/u-boot.lds | 64 | --- a/arch/powerpc/cpu/mpc5xxx/u-boot.lds |
74 | +++ git/arch/powerpc/cpu/mpc8260/u-boot.lds | 65 | +++ b/arch/powerpc/cpu/mpc5xxx/u-boot.lds |
75 | @@ -27,7 +27,6 @@ SECTIONS | 66 | @@ -28,7 +28,6 @@ SECTIONS |
76 | _GOT2_TABLE_ = .; | 67 | _GOT2_TABLE_ = .; |
77 | KEEP(*(.got2)) | 68 | KEEP(*(.got2)) |
78 | KEEP(*(.got)) | 69 | KEEP(*(.got)) |
@@ -80,11 +71,11 @@ Index: git/arch/powerpc/cpu/mpc8260/u-boot.lds | |||
80 | _FIXUP_TABLE_ = .; | 71 | _FIXUP_TABLE_ = .; |
81 | KEEP(*(.fixup)) | 72 | KEEP(*(.fixup)) |
82 | } | 73 | } |
83 | Index: git/arch/powerpc/cpu/74xx_7xx/u-boot.lds | 74 | diff --git a/arch/powerpc/cpu/mpc8260/u-boot.lds b/arch/powerpc/cpu/mpc8260/u-boot.lds |
84 | =================================================================== | 75 | index 50cbf85..469fc29 100644 |
85 | --- git.orig/arch/powerpc/cpu/74xx_7xx/u-boot.lds | 76 | --- a/arch/powerpc/cpu/mpc8260/u-boot.lds |
86 | +++ git/arch/powerpc/cpu/74xx_7xx/u-boot.lds | 77 | +++ b/arch/powerpc/cpu/mpc8260/u-boot.lds |
87 | @@ -30,7 +30,6 @@ SECTIONS | 78 | @@ -27,7 +27,6 @@ SECTIONS |
88 | _GOT2_TABLE_ = .; | 79 | _GOT2_TABLE_ = .; |
89 | KEEP(*(.got2)) | 80 | KEEP(*(.got2)) |
90 | KEEP(*(.got)) | 81 | KEEP(*(.got)) |
@@ -92,23 +83,23 @@ Index: git/arch/powerpc/cpu/74xx_7xx/u-boot.lds | |||
92 | _FIXUP_TABLE_ = .; | 83 | _FIXUP_TABLE_ = .; |
93 | KEEP(*(.fixup)) | 84 | KEEP(*(.fixup)) |
94 | } | 85 | } |
95 | Index: git/arch/powerpc/cpu/mpc512x/u-boot.lds | 86 | diff --git a/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds |
96 | =================================================================== | 87 | index 774772b..4101eaf 100644 |
97 | --- git.orig/arch/powerpc/cpu/mpc512x/u-boot.lds | 88 | --- a/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds |
98 | +++ git/arch/powerpc/cpu/mpc512x/u-boot.lds | 89 | +++ b/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds |
99 | @@ -24,7 +24,6 @@ SECTIONS | 90 | @@ -24,7 +24,6 @@ SECTIONS |
100 | _GOT2_TABLE_ = .; | 91 | _GOT2_TABLE_ = .; |
101 | KEEP(*(.got2)) | 92 | KEEP(*(.got2)) |
102 | KEEP(*(.got)) | 93 | KEEP(*(.got)) |
103 | - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); | 94 | - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); |
104 | _FIXUP_TABLE_ = .; | 95 | } |
105 | KEEP(*(.fixup)) | 96 | __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; |
106 | *(.fixup) | 97 | |
107 | Index: git/arch/powerpc/cpu/mpc5xx/u-boot.lds | 98 | diff --git a/arch/powerpc/cpu/mpc83xx/u-boot.lds b/arch/powerpc/cpu/mpc83xx/u-boot.lds |
108 | =================================================================== | 99 | index 3c177fa..dbd8bbe 100644 |
109 | --- git.orig/arch/powerpc/cpu/mpc5xx/u-boot.lds | 100 | --- a/arch/powerpc/cpu/mpc83xx/u-boot.lds |
110 | +++ git/arch/powerpc/cpu/mpc5xx/u-boot.lds | 101 | +++ b/arch/powerpc/cpu/mpc83xx/u-boot.lds |
111 | @@ -33,7 +33,6 @@ SECTIONS | 102 | @@ -26,7 +26,6 @@ SECTIONS |
112 | _GOT2_TABLE_ = .; | 103 | _GOT2_TABLE_ = .; |
113 | KEEP(*(.got2)) | 104 | KEEP(*(.got2)) |
114 | KEEP(*(.got)) | 105 | KEEP(*(.got)) |
@@ -116,11 +107,11 @@ Index: git/arch/powerpc/cpu/mpc5xx/u-boot.lds | |||
116 | _FIXUP_TABLE_ = .; | 107 | _FIXUP_TABLE_ = .; |
117 | KEEP(*(.fixup)) | 108 | KEEP(*(.fixup)) |
118 | } | 109 | } |
119 | Index: git/arch/powerpc/cpu/mpc5xxx/u-boot.lds | 110 | diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds |
120 | =================================================================== | 111 | index f933b21..0399f93 100644 |
121 | --- git.orig/arch/powerpc/cpu/mpc5xxx/u-boot.lds | 112 | --- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds |
122 | +++ git/arch/powerpc/cpu/mpc5xxx/u-boot.lds | 113 | +++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds |
123 | @@ -28,7 +28,6 @@ SECTIONS | 114 | @@ -44,7 +44,6 @@ SECTIONS |
124 | _GOT2_TABLE_ = .; | 115 | _GOT2_TABLE_ = .; |
125 | KEEP(*(.got2)) | 116 | KEEP(*(.got2)) |
126 | KEEP(*(.got)) | 117 | KEEP(*(.got)) |
@@ -128,23 +119,35 @@ Index: git/arch/powerpc/cpu/mpc5xxx/u-boot.lds | |||
128 | _FIXUP_TABLE_ = .; | 119 | _FIXUP_TABLE_ = .; |
129 | KEEP(*(.fixup)) | 120 | KEEP(*(.fixup)) |
130 | } | 121 | } |
131 | Index: git/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds | 122 | diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds |
132 | =================================================================== | 123 | index b83c553..f044564 100644 |
133 | --- git.orig/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds | 124 | --- a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds |
134 | +++ git/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds | 125 | +++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds |
135 | @@ -24,7 +24,6 @@ SECTIONS | 126 | @@ -22,7 +22,6 @@ SECTIONS |
136 | _GOT2_TABLE_ = .; | 127 | _GOT2_TABLE_ = .; |
137 | KEEP(*(.got2)) | 128 | KEEP(*(.got2)) |
138 | KEEP(*(.got)) | 129 | KEEP(*(.got)) |
139 | - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); | 130 | - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); |
131 | _FIXUP_TABLE_ = .; | ||
132 | KEEP(*(.fixup)) | ||
140 | } | 133 | } |
141 | __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; | 134 | diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds |
142 | 135 | index 5ae7b3e..889a4c2 100644 | |
143 | Index: git/arch/powerpc/cpu/mpc83xx/u-boot.lds | 136 | --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds |
144 | =================================================================== | 137 | +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds |
145 | --- git.orig/arch/powerpc/cpu/mpc83xx/u-boot.lds | 138 | @@ -29,7 +29,6 @@ SECTIONS |
146 | +++ git/arch/powerpc/cpu/mpc83xx/u-boot.lds | 139 | _GOT2_TABLE_ = .; |
147 | @@ -26,7 +26,6 @@ SECTIONS | 140 | KEEP(*(.got2)) |
141 | KEEP(*(.got)) | ||
142 | - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); | ||
143 | _FIXUP_TABLE_ = .; | ||
144 | KEEP(*(.fixup)) | ||
145 | } | ||
146 | diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds | ||
147 | index 2cf0b25..f15eaf3 100644 | ||
148 | --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds | ||
149 | +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds | ||
150 | @@ -50,7 +50,6 @@ SECTIONS | ||
148 | _GOT2_TABLE_ = .; | 151 | _GOT2_TABLE_ = .; |
149 | KEEP(*(.got2)) | 152 | KEEP(*(.got2)) |
150 | KEEP(*(.got)) | 153 | KEEP(*(.got)) |
@@ -152,10 +155,10 @@ Index: git/arch/powerpc/cpu/mpc83xx/u-boot.lds | |||
152 | _FIXUP_TABLE_ = .; | 155 | _FIXUP_TABLE_ = .; |
153 | KEEP(*(.fixup)) | 156 | KEEP(*(.fixup)) |
154 | } | 157 | } |
155 | Index: git/arch/powerpc/cpu/mpc86xx/u-boot.lds | 158 | diff --git a/arch/powerpc/cpu/mpc86xx/u-boot.lds b/arch/powerpc/cpu/mpc86xx/u-boot.lds |
156 | =================================================================== | 159 | index 58467c2..6c48f40 100644 |
157 | --- git.orig/arch/powerpc/cpu/mpc86xx/u-boot.lds | 160 | --- a/arch/powerpc/cpu/mpc86xx/u-boot.lds |
158 | +++ git/arch/powerpc/cpu/mpc86xx/u-boot.lds | 161 | +++ b/arch/powerpc/cpu/mpc86xx/u-boot.lds |
159 | @@ -32,7 +32,6 @@ SECTIONS | 162 | @@ -32,7 +32,6 @@ SECTIONS |
160 | _GOT2_TABLE_ = .; | 163 | _GOT2_TABLE_ = .; |
161 | KEEP(*(.got2)) | 164 | KEEP(*(.got2)) |
@@ -164,22 +167,10 @@ Index: git/arch/powerpc/cpu/mpc86xx/u-boot.lds | |||
164 | _FIXUP_TABLE_ = .; | 167 | _FIXUP_TABLE_ = .; |
165 | KEEP(*(.fixup)) | 168 | KEEP(*(.fixup)) |
166 | } | 169 | } |
167 | Index: git/arch/powerpc/cpu/mpc8xx/u-boot.lds | 170 | diff --git a/arch/powerpc/cpu/ppc4xx/u-boot.lds b/arch/powerpc/cpu/ppc4xx/u-boot.lds |
168 | =================================================================== | 171 | index 1980508..55dd4e1 100644 |
169 | --- git.orig/arch/powerpc/cpu/mpc8xx/u-boot.lds | 172 | --- a/arch/powerpc/cpu/ppc4xx/u-boot.lds |
170 | +++ git/arch/powerpc/cpu/mpc8xx/u-boot.lds | 173 | +++ b/arch/powerpc/cpu/ppc4xx/u-boot.lds |
171 | @@ -34,7 +34,6 @@ SECTIONS | ||
172 | _GOT2_TABLE_ = .; | ||
173 | KEEP(*(.got2)) | ||
174 | KEEP(*(.got)) | ||
175 | - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); | ||
176 | _FIXUP_TABLE_ = .; | ||
177 | KEEP(*(.fixup)) | ||
178 | } | ||
179 | Index: git/arch/powerpc/cpu/ppc4xx/u-boot.lds | ||
180 | =================================================================== | ||
181 | --- git.orig/arch/powerpc/cpu/ppc4xx/u-boot.lds | ||
182 | +++ git/arch/powerpc/cpu/ppc4xx/u-boot.lds | ||
183 | @@ -46,7 +46,6 @@ SECTIONS | 174 | @@ -46,7 +46,6 @@ SECTIONS |
184 | _GOT2_TABLE_ = .; | 175 | _GOT2_TABLE_ = .; |
185 | KEEP(*(.got2)) | 176 | KEEP(*(.got2)) |
@@ -188,3 +179,6 @@ Index: git/arch/powerpc/cpu/ppc4xx/u-boot.lds | |||
188 | _FIXUP_TABLE_ = .; | 179 | _FIXUP_TABLE_ = .; |
189 | KEEP(*(.fixup)) | 180 | KEEP(*(.fixup)) |
190 | } | 181 | } |
182 | -- | ||
183 | 2.4.6 | ||
184 | |||