From: "Andreas Bießmann" <andreas.devel@googlemail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH RFC 3/3] arm920t: do not relocate NULL pointer
Date: Tue, 30 Nov 2010 08:06:40 +0100 [thread overview]
Message-ID: <1291100800-61850-4-git-send-email-andreas.devel@googlemail.com> (raw)
In-Reply-To: <1291100800-61850-1-git-send-email-andreas.devel@googlemail.com>
Signed-off-by: Andreas Bie?mann <andreas.devel@googlemail.com>
---
arch/arm/cpu/arm920t/start.S | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S
index 629be3f..e3f9cdb 100644
--- a/arch/arm/cpu/arm920t/start.S
+++ b/arch/arm/cpu/arm920t/start.S
@@ -248,11 +248,15 @@ fixabs:
mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */
add r1, r10, r1 /* r1 <- address of symbol in table */
ldr r1, [r1, #4] /* r1 <- symbol value */
+ cmp r1, #0 /* symbol == NULL ? */
+ beq fixnext
add r1, r9 /* r1 <- relocated sym addr */
b fixnext
fixrel:
/* relative fix: increase location by offset */
ldr r1, [r0] /* r1 <- address of symbol */
+ cmp r1, #0 /* symbol == NULL ? */
+ beq fixnext
add r1, r1, r9 /* r1 <- relocated address of symbol */
fixnext:
str r1, [r0] /* store back content of r1 */
--
1.7.3.2
next prev parent reply other threads:[~2010-11-30 7:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-29 19:58 [U-Boot] Try to fix Board eb_cpux9k2 Jens Scharsig
2010-11-30 7:06 ` [U-Boot] [PATCH RFC 0/3] chenages to arm relocation Andreas Bießmann
2010-11-30 7:06 ` [U-Boot] [PATCH RFC 1/3] arm920t: do not set register useless Andreas Bießmann
2010-11-30 8:07 ` Albert ARIBAUD
2010-11-30 8:28 ` Andreas Bießmann
2010-11-30 9:25 ` Albert ARIBAUD
2010-11-30 7:06 ` [U-Boot] [PATCH RFC 2/3] arm920t: do not use r8 for relocation Andreas Bießmann
2010-11-30 8:22 ` Albert ARIBAUD
2010-11-30 8:35 ` Andreas Bießmann
2010-11-30 8:58 ` Albert ARIBAUD
2010-11-30 7:06 ` Andreas Bießmann [this message]
2010-11-30 8:32 ` [U-Boot] [PATCH RFC 3/3] arm920t: do not relocate NULL pointer Albert ARIBAUD
2010-11-30 8:47 ` Joakim Tjernlund
2010-11-30 8:50 ` Andreas Bießmann
2010-11-30 9:02 ` Albert ARIBAUD
2010-11-30 9:41 ` Joakim Tjernlund
2010-11-30 11:48 ` Andreas Bießmann
2010-11-30 11:56 ` Joakim Tjernlund
2010-11-30 8:37 ` [U-Boot] Try to fix Board eb_cpux9k2 Albert ARIBAUD
2010-12-02 20:27 ` Jens Scharsig
2010-12-02 20:49 ` Albert ARIBAUD
2010-12-01 6:44 ` Albert ARIBAUD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1291100800-61850-4-git-send-email-andreas.devel@googlemail.com \
--to=andreas.devel@googlemail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox