Skip to content
Snippets Groups Projects
Commit 908261f3 authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

parents 12a67a9e 0f8c62a1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 3 deletions
cpu/mips/start.S
+ 6
− 3
View file @ 908261f3
...@@ -345,7 +345,8 @@ relocate_code: ...@@ -345,7 +345,8 @@ relocate_code:
jr t0 jr t0
nop nop
.gpword _GLOBAL_OFFSET_TABLE_ /* _GLOBAL_OFFSET_TABLE_ - _gp */ .word _gp
.word _GLOBAL_OFFSET_TABLE_
.word uboot_end_data .word uboot_end_data
.word uboot_end .word uboot_end
.word num_got_entries .word num_got_entries
...@@ -358,8 +359,10 @@ in_ram: ...@@ -358,8 +359,10 @@ in_ram:
* generated by GNU ld. Skip these reserved entries from relocation. * generated by GNU ld. Skip these reserved entries from relocation.
*/ */
lw t3, -4(t0) /* t3 <-- num_got_entries */ lw t3, -4(t0) /* t3 <-- num_got_entries */
lw t4, -16(t0) /* t4 <-- (_GLOBAL_OFFSET_TABLE_ - _gp) */ lw t4, -16(t0) /* t4 <-- _GLOBAL_OFFSET_TABLE_ */
add t4, t4, gp /* t4 now holds _GLOBAL_OFFSET_TABLE_ */ lw t5, -20(t0) /* t5 <-- _gp */
sub t4, t5 /* compute offset*/
add t4, t4, gp /* t4 now holds relocated _GLOBAL_OFFSET_TABLE_ */
addi t4, t4, 8 /* Skipping first two entries. */ addi t4, t4, 8 /* Skipping first two entries. */
li t2, 2 li t2, 2
1: 1:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment