From c1fa1b7d00712b41a6c710e7ed33782cb3f47191 Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Sun, 24 Apr 2011 10:29:32 +0200 Subject: [PATCH] powerpc, 8xx: Fix fallout from "Fixup all 8xx u-boot.lds scripts" Two linker scripts for 8xx was missed. Signed-off-by: Joakim Tjernlund --- board/matrix_vision/mvsmr/u-boot.lds | 2 +- board/rsdproto/u-boot.lds | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/board/matrix_vision/mvsmr/u-boot.lds b/board/matrix_vision/mvsmr/u-boot.lds index bf2ed04852..57c37deb89 100644 --- a/board/matrix_vision/mvsmr/u-boot.lds +++ b/board/matrix_vision/mvsmr/u-boot.lds @@ -62,7 +62,7 @@ SECTIONS _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } - __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2; + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; __fixup_entries = (. - _FIXUP_TABLE_) >> 2; .data : diff --git a/board/rsdproto/u-boot.lds b/board/rsdproto/u-boot.lds index 81728db25c..a729c52626 100644 --- a/board/rsdproto/u-boot.lds +++ b/board/rsdproto/u-boot.lds @@ -74,11 +74,12 @@ SECTIONS PROVIDE (erotext = .); .reloc : { - *(.got) _GOT2_TABLE_ = .; - *(.got2) + KEEP(*(.got2)) + KEEP(*(.got)) + PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; - *(.fixup) + KEEP(*(.fixup)) } __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; __fixup_entries = (. - _FIXUP_TABLE_)>>2; -- 2.39.5