瀏覽代碼

relocation: Do not relocate NULL pointers.

NULL is an absolute value and should not be relocated.
After this correction code like:
 void weak_fun(void) __attribute__((weak));
 printf("weak_fun:%p\n", weak_fun);
will still print null after relocation.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Joakim Tjernlund 15 年之前
父節點
當前提交
afc3ba0fc4

+ 4 - 2
cpu/74xx_7xx/start.S

@@ -716,15 +716,17 @@ in_ram:
 	sub	r11,r3,r11
 	sub	r11,r3,r11
 	addi	r3,r3,-4
 	addi	r3,r3,-4
 1:	lwzu	r0,4(r3)
 1:	lwzu	r0,4(r3)
+	cmpwi	r0,0
+	beq-	2f
 	add	r0,r0,r11
 	add	r0,r0,r11
 	stw	r0,0(r3)
 	stw	r0,0(r3)
-	bdnz	1b
+2:	bdnz	1b
 
 
 	/*
 	/*
 	 * Now adjust the fixups and the pointers to the fixups
 	 * Now adjust the fixups and the pointers to the fixups
 	 * in case we need to move ourselves again.
 	 * in case we need to move ourselves again.
 	 */
 	 */
-2:	li	r0,__fixup_entries@sectoff@l
+	li	r0,__fixup_entries@sectoff@l
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	cmpwi	r0,0
 	cmpwi	r0,0
 	mtctr	r0
 	mtctr	r0

+ 4 - 2
cpu/mpc512x/start.S

@@ -611,15 +611,17 @@ in_ram:
 	sub	r11,r3,r11
 	sub	r11,r3,r11
 	addi	r3,r3,-4
 	addi	r3,r3,-4
 1:	lwzu	r0,4(r3)
 1:	lwzu	r0,4(r3)
+	cmpwi	r0,0
+	beq-	2f
 	add	r0,r0,r11
 	add	r0,r0,r11
 	stw	r0,0(r3)
 	stw	r0,0(r3)
-	bdnz	1b
+2:	bdnz	1b
 
 
 	/*
 	/*
 	 * Now adjust the fixups and the pointers to the fixups
 	 * Now adjust the fixups and the pointers to the fixups
 	 * in case we need to move ourselves again.
 	 * in case we need to move ourselves again.
 	 */
 	 */
-2:	li	r0,__fixup_entries@sectoff@l
+	li	r0,__fixup_entries@sectoff@l
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	cmpwi	r0,0
 	cmpwi	r0,0
 	mtctr	r0
 	mtctr	r0

+ 4 - 2
cpu/mpc5xx/start.S

@@ -458,15 +458,17 @@ in_ram:
 	sub	r11,r3,r11
 	sub	r11,r3,r11
 	addi	r3,r3,-4
 	addi	r3,r3,-4
 1:	lwzu	r0,4(r3)
 1:	lwzu	r0,4(r3)
+	cmpwi	r0,0
+	beq-	2f
 	add	r0,r0,r11
 	add	r0,r0,r11
 	stw	r0,0(r3)
 	stw	r0,0(r3)
-	bdnz	1b
+2:	bdnz	1b
 
 
 	/*
 	/*
 	 * Now adjust the fixups and the pointers to the fixups
 	 * Now adjust the fixups and the pointers to the fixups
 	 * in case we need to move ourselves again.
 	 * in case we need to move ourselves again.
 	 */
 	 */
-2:	li	r0,__fixup_entries@sectoff@l
+	li	r0,__fixup_entries@sectoff@l
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	cmpwi	r0,0
 	cmpwi	r0,0
 	mtctr	r0
 	mtctr	r0

+ 4 - 2
cpu/mpc5xxx/start.S

@@ -684,15 +684,17 @@ in_ram:
 	sub	r11,r3,r11
 	sub	r11,r3,r11
 	addi	r3,r3,-4
 	addi	r3,r3,-4
 1:	lwzu	r0,4(r3)
 1:	lwzu	r0,4(r3)
+	cmpwi	r0,0
+	beq-	2f
 	add	r0,r0,r11
 	add	r0,r0,r11
 	stw	r0,0(r3)
 	stw	r0,0(r3)
-	bdnz	1b
+2:	bdnz	1b
 
 
 	/*
 	/*
 	 * Now adjust the fixups and the pointers to the fixups
 	 * Now adjust the fixups and the pointers to the fixups
 	 * in case we need to move ourselves again.
 	 * in case we need to move ourselves again.
 	 */
 	 */
-2:	li	r0,__fixup_entries@sectoff@l
+	li	r0,__fixup_entries@sectoff@l
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	cmpwi	r0,0
 	cmpwi	r0,0
 	mtctr	r0
 	mtctr	r0

+ 4 - 2
cpu/mpc8220/start.S

@@ -649,15 +649,17 @@ in_ram:
 	sub	r11,r3,r11
 	sub	r11,r3,r11
 	addi	r3,r3,-4
 	addi	r3,r3,-4
 1:	lwzu	r0,4(r3)
 1:	lwzu	r0,4(r3)
+	cmpwi	r0,0
+	beq-	2f
 	add	r0,r0,r11
 	add	r0,r0,r11
 	stw	r0,0(r3)
 	stw	r0,0(r3)
-	bdnz	1b
+2:	bdnz	1b
 
 
 	/*
 	/*
 	 * Now adjust the fixups and the pointers to the fixups
 	 * Now adjust the fixups and the pointers to the fixups
 	 * in case we need to move ourselves again.
 	 * in case we need to move ourselves again.
 	 */
 	 */
-2:	li	r0,__fixup_entries@sectoff@l
+	li	r0,__fixup_entries@sectoff@l
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	cmpwi	r0,0
 	cmpwi	r0,0
 	mtctr	r0
 	mtctr	r0

+ 4 - 2
cpu/mpc824x/start.S

@@ -589,15 +589,17 @@ in_ram:
 	sub	r11,r3,r11
 	sub	r11,r3,r11
 	addi	r3,r3,-4
 	addi	r3,r3,-4
 1:	lwzu	r0,4(r3)
 1:	lwzu	r0,4(r3)
+	cmpwi	r0,0
+	beq-	2f
 	add	r0,r0,r11
 	add	r0,r0,r11
 	stw	r0,0(r3)
 	stw	r0,0(r3)
-	bdnz	1b
+2:	bdnz	1b
 
 
 	/*
 	/*
 	 * Now adjust the fixups and the pointers to the fixups
 	 * Now adjust the fixups and the pointers to the fixups
 	 * in case we need to move ourselves again.
 	 * in case we need to move ourselves again.
 	 */
 	 */
-2:	li	r0,__fixup_entries@sectoff@l
+	li	r0,__fixup_entries@sectoff@l
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	cmpwi	r0,0
 	cmpwi	r0,0
 	mtctr	r0
 	mtctr	r0

+ 4 - 2
cpu/mpc8260/start.S

@@ -909,15 +909,17 @@ in_ram:
 	sub	r11,r3,r11
 	sub	r11,r3,r11
 	addi	r3,r3,-4
 	addi	r3,r3,-4
 1:	lwzu	r0,4(r3)
 1:	lwzu	r0,4(r3)
+	cmpwi	r0,0
+	beq-	2f
 	add	r0,r0,r11
 	add	r0,r0,r11
 	stw	r0,0(r3)
 	stw	r0,0(r3)
-	bdnz	1b
+2:	bdnz	1b
 
 
 	/*
 	/*
 	 * Now adjust the fixups and the pointers to the fixups
 	 * Now adjust the fixups and the pointers to the fixups
 	 * in case we need to move ourselves again.
 	 * in case we need to move ourselves again.
 	 */
 	 */
-2:	li	r0,__fixup_entries@sectoff@l
+	li	r0,__fixup_entries@sectoff@l
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	cmpwi	r0,0
 	cmpwi	r0,0
 	mtctr	r0
 	mtctr	r0

+ 4 - 2
cpu/mpc83xx/start.S

@@ -957,16 +957,18 @@ in_ram:
 	sub	r11,r3,r11
 	sub	r11,r3,r11
 	addi	r3,r3,-4
 	addi	r3,r3,-4
 1:	lwzu	r0,4(r3)
 1:	lwzu	r0,4(r3)
+	cmpwi	r0,0
+	beq-	2f
 	add	r0,r0,r11
 	add	r0,r0,r11
 	stw	r0,0(r3)
 	stw	r0,0(r3)
-	bdnz	1b
+2:	bdnz	1b
 
 
 #ifndef CONFIG_NAND_SPL
 #ifndef CONFIG_NAND_SPL
 	/*
 	/*
 	 * Now adjust the fixups and the pointers to the fixups
 	 * Now adjust the fixups and the pointers to the fixups
 	 * in case we need to move ourselves again.
 	 * in case we need to move ourselves again.
 	 */
 	 */
-2:	li	r0,__fixup_entries@sectoff@l
+	li	r0,__fixup_entries@sectoff@l
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	cmpwi	r0,0
 	cmpwi	r0,0
 	mtctr	r0
 	mtctr	r0

+ 4 - 2
cpu/mpc85xx/start.S

@@ -977,15 +977,17 @@ in_ram:
 	sub	r11,r3,r11
 	sub	r11,r3,r11
 	addi	r3,r3,-4
 	addi	r3,r3,-4
 1:	lwzu	r0,4(r3)
 1:	lwzu	r0,4(r3)
+	cmpwi	r0,0
+	beq-	2f
 	add	r0,r0,r11
 	add	r0,r0,r11
 	stw	r0,0(r3)
 	stw	r0,0(r3)
-	bdnz	1b
+2:	bdnz	1b
 
 
 	/*
 	/*
 	 * Now adjust the fixups and the pointers to the fixups
 	 * Now adjust the fixups and the pointers to the fixups
 	 * in case we need to move ourselves again.
 	 * in case we need to move ourselves again.
 	 */
 	 */
-2:	li	r0,__fixup_entries@sectoff@l
+	li	r0,__fixup_entries@sectoff@l
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	cmpwi	r0,0
 	cmpwi	r0,0
 	mtctr	r0
 	mtctr	r0

+ 4 - 2
cpu/mpc86xx/start.S

@@ -733,15 +733,17 @@ in_ram:
 	sub	r11,r3,r11
 	sub	r11,r3,r11
 	addi	r3,r3,-4
 	addi	r3,r3,-4
 1:	lwzu	r0,4(r3)
 1:	lwzu	r0,4(r3)
+	cmpwi	r0,0
+	beq-	2f
 	add	r0,r0,r11
 	add	r0,r0,r11
 	stw	r0,0(r3)
 	stw	r0,0(r3)
-	bdnz	1b
+2:	bdnz	1b
 
 
 	/*
 	/*
 	 * Now adjust the fixups and the pointers to the fixups
 	 * Now adjust the fixups and the pointers to the fixups
 	 * in case we need to move ourselves again.
 	 * in case we need to move ourselves again.
 	 */
 	 */
-2:	li	r0,__fixup_entries@sectoff@l
+	li	r0,__fixup_entries@sectoff@l
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	cmpwi	r0,0
 	cmpwi	r0,0
 	mtctr	r0
 	mtctr	r0

+ 4 - 2
cpu/mpc8xx/start.S

@@ -589,15 +589,17 @@ in_ram:
 	sub	r11,r3,r11
 	sub	r11,r3,r11
 	addi	r3,r3,-4
 	addi	r3,r3,-4
 1:	lwzu	r0,4(r3)
 1:	lwzu	r0,4(r3)
+	cmpwi	r0,0
+	beq-	2f
 	add	r0,r0,r11
 	add	r0,r0,r11
 	stw	r0,0(r3)
 	stw	r0,0(r3)
-	bdnz	1b
+2:	bdnz	1b
 
 
 	/*
 	/*
 	 * Now adjust the fixups and the pointers to the fixups
 	 * Now adjust the fixups and the pointers to the fixups
 	 * in case we need to move ourselves again.
 	 * in case we need to move ourselves again.
 	 */
 	 */
-2:	li	r0,__fixup_entries@sectoff@l
+	li	r0,__fixup_entries@sectoff@l
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	cmpwi	r0,0
 	cmpwi	r0,0
 	mtctr	r0
 	mtctr	r0

+ 4 - 2
cpu/ppc4xx/start.S

@@ -1596,15 +1596,17 @@ in_ram:
 	sub	r11,r3,r11
 	sub	r11,r3,r11
 	addi	r3,r3,-4
 	addi	r3,r3,-4
 1:	lwzu	r0,4(r3)
 1:	lwzu	r0,4(r3)
+	cmpwi	r0,0
+	beq-	2f
 	add	r0,r0,r11
 	add	r0,r0,r11
 	stw	r0,0(r3)
 	stw	r0,0(r3)
-	bdnz	1b
+2:	bdnz	1b
 
 
 	/*
 	/*
 	 * Now adjust the fixups and the pointers to the fixups
 	 * Now adjust the fixups and the pointers to the fixups
 	 * in case we need to move ourselves again.
 	 * in case we need to move ourselves again.
 	 */
 	 */
-2:	li	r0,__fixup_entries@sectoff@l
+	li	r0,__fixup_entries@sectoff@l
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	lwz	r3,GOT(_FIXUP_TABLE_)
 	cmpwi	r0,0
 	cmpwi	r0,0
 	mtctr	r0
 	mtctr	r0