diff mbox

[U-Boot,3/3] powerpc, 8xx: adapt a few linker scripts so it will build.

Message ID OF1D83C022.CA64305C-ONC125787D.004281F2-C125787D.0042E287@transmode.se
State Changes Requested
Delegated to: Wolfgang Denk
Headers show

Commit Message

Joakim Tjernlund April 25, 2011, 12:10 p.m. UTC 
Wolfgang Denk <wd@denx.de> wrote on 2011/04/25 12:17:11:
>
> Dear Joakim Tjernlund,
>
> In message <OF522299D7.A02484A0-ONC125787D.003187D6-C125787D.0032F0AF@transmode.se> you wrote:
> >
> > > If in doubt, use ELDK.  All examples were compiled with ELDK 4.2 (GCC
> > > 4.2.2) for ppc_8xx.
> >
> > Have you tried gcc 4.3.x yet?
>
> No, and from the list of bugs I have seen for it (especially for ARM)
> I will not invest time and efforts on it.
>
> > I think the mistake was to include the use of -fno-jump-tables in that
> > patch too. The -msingle-pic-base part should be a NOP to all gcc's that
> > don't have it.
>
> Maybe.
>
> > > > I still don't know why it broke with your gcc but I suspect
> > > > it is due to -fno-jump-tables(which is in the msingle-pic-base patch).
> > > > Seems like that option in your case makes the code bigger.
> > >
> > > Indeed. As I cannot see any advantages, I reject this stuff, at least
> > > for now.
> >
> > Indeed? Does that mean you confirmed that -fno-jump-tables was the cause?
> > I can respin the patch without that part if so.
>
> The "indeed" refers to the "in my case your patches make the code
> bigger".  I cannot confirm anything else as I haven't tested it.

Dare I ask you try this revised patch with -fno-jump-tables removed?

From bc7b7079b44bf6d8e3e38b58c867972e6b95280d Mon Sep 17 00:00:00 2001
From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Date: Mon, 6 Dec 2010 18:35:37 +0100
Subject: [PATCH] powerpc: Add support for -msingle-pic-base

-msingle-pic-base is a new gcc option for ppc and
it reduces the size of my u-boot with 6-8 KB.

-msingle-pic-base is in gcc 4.6, however
backported patches are available at
http://bugs.gentoo.org/show_bug.cgi?id=347281

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
---

 V2 - remove gcc option -fno-jump-tables

 arch/powerpc/config.mk            |    1 +
 arch/powerpc/cpu/74xx_7xx/start.S |   11 ++++++++++-
 arch/powerpc/cpu/mpc512x/start.S  |   11 ++++++++++-
 arch/powerpc/cpu/mpc5xx/start.S   |   11 ++++++++++-
 arch/powerpc/cpu/mpc5xxx/start.S  |   11 ++++++++++-
 arch/powerpc/cpu/mpc8220/start.S  |   11 ++++++++++-
 arch/powerpc/cpu/mpc824x/start.S  |   11 ++++++++++-
 arch/powerpc/cpu/mpc8260/start.S  |    6 +++++-
 arch/powerpc/cpu/mpc83xx/start.S  |   11 ++++++++++-
 arch/powerpc/cpu/mpc85xx/start.S  |   10 ++++++++++
 arch/powerpc/cpu/mpc86xx/start.S  |   11 ++++++++++-
 arch/powerpc/cpu/mpc8xx/start.S   |   11 ++++++++++-
 arch/powerpc/cpu/ppc4xx/start.S   |   22 ++++++++++++++++++++--
 13 files changed, 126 insertions(+), 12 deletions(-)

--
1.7.3.4
diff mbox

Patch

diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk
index e682071..7286159 100644
--- a/arch/powerpc/config.mk
+++ b/arch/powerpc/config.mk
@@ -26,6 +26,7 @@  CROSS_COMPILE ?= ppc_8xx-
 CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
 LDFLAGS_FINAL += --gc-sections
 PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections -fdata-sections
+PLATFORM_RELFLAGS += $(call cc-option,-msingle-pic-base,)
 PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__
 PLATFORM_LDFLAGS  += -n

diff --git a/arch/powerpc/cpu/74xx_7xx/start.S b/arch/powerpc/cpu/74xx_7xx/start.S
index f6011fc..ab9412a 100644
--- a/arch/powerpc/cpu/74xx_7xx/start.S
+++ b/arch/powerpc/cpu/74xx_7xx/start.S
@@ -274,7 +274,11 @@  in_flash:
 	stwu	r0, -4(r1)	/* stack backtraces terminate cleanly	*/

 	GET_GOT			/* initialize GOT access	*/
-
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	/* run low-level CPU init code     (from Flash)	*/
 	bl	cpu_init_f
 	sync
@@ -588,6 +592,11 @@  relocate_code:
 	mr	r10, r5		/* Save copy of Destination Address	*/

 	GET_GOT
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	mr	r3,  r5				/* Destination Address	*/
 	lis	r4, CONFIG_SYS_MONITOR_BASE@h		/* Source      Address	*/
 	ori	r4, r4, CONFIG_SYS_MONITOR_BASE@l
diff --git a/arch/powerpc/cpu/mpc512x/start.S b/arch/powerpc/cpu/mpc512x/start.S
index 9c2e488..632f967 100644
--- a/arch/powerpc/cpu/mpc512x/start.S
+++ b/arch/powerpc/cpu/mpc512x/start.S
@@ -255,7 +255,11 @@  in_flash:
 	/*------------------------------------------------------*/

 	GET_GOT			/* initialize GOT access	*/
-
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	/* r3: IMMR */
 	lis	r3, CONFIG_SYS_IMMR@h
 	/* run low-level CPU init code (in Flash) */
@@ -486,6 +490,11 @@  relocate_code:
 	mr	r10, r5		/* Save copy of Destination Address */

 	GET_GOT
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	mr	r3,  r5				/* Destination Address */
 	lis	r4, CONFIG_SYS_MONITOR_BASE@h		/* Source      Address */
 	ori	r4, r4, CONFIG_SYS_MONITOR_BASE@l
diff --git a/arch/powerpc/cpu/mpc5xx/start.S b/arch/powerpc/cpu/mpc5xx/start.S
index cc11c8f..4fb2047 100644
--- a/arch/powerpc/cpu/mpc5xx/start.S
+++ b/arch/powerpc/cpu/mpc5xx/start.S
@@ -174,7 +174,11 @@  in_flash:
 	/*----------------------------------------------------------------------*/

 	GET_GOT			/* initialize GOT access			*/
-
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	/* r3: IMMR */
 	bl	cpu_init_f	/* run low-level CPU init code     (from Flash)	*/

@@ -363,6 +367,11 @@  relocate_code:
 	mr	r10, r5		/* Save copy of monitor destination Address in SRAM */

 	GET_GOT
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	mr	r3,  r5				/* Destination Address	*/
 	lis	r4, CONFIG_SYS_MONITOR_BASE@h		/* Source      Address	*/
 	ori	r4, r4, CONFIG_SYS_MONITOR_BASE@l
diff --git a/arch/powerpc/cpu/mpc5xxx/start.S b/arch/powerpc/cpu/mpc5xxx/start.S
index 192aa50..0a05361 100644
--- a/arch/powerpc/cpu/mpc5xxx/start.S
+++ b/arch/powerpc/cpu/mpc5xxx/start.S
@@ -160,7 +160,11 @@  lowboot_reentry:
 	/*--------------------------------------------------------------*/

 	GET_GOT			/* initialize GOT access		*/
-
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	/* r3: IMMR */
 	bl	cpu_init_f	/* run low-level CPU init code (in Flash)*/

@@ -549,6 +553,11 @@  relocate_code:
 	mr	r10, r5		/* Save copy of Destination Address	*/

 	GET_GOT
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	mr	r3,  r5				/* Destination Address	*/
 	lis	r4, CONFIG_SYS_MONITOR_BASE@h		/* Source      Address	*/
 	ori	r4, r4, CONFIG_SYS_MONITOR_BASE@l
diff --git a/arch/powerpc/cpu/mpc8220/start.S b/arch/powerpc/cpu/mpc8220/start.S
index 300b35c..1df87a6 100644
--- a/arch/powerpc/cpu/mpc8220/start.S
+++ b/arch/powerpc/cpu/mpc8220/start.S
@@ -129,7 +129,11 @@  _start:
 	/*--------------------------------------------------------------*/

 	GET_GOT			/* initialize GOT access		*/
-
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	/* r3: IMMR */
 	bl	cpu_init_f	/* run low-level CPU init code (in Flash)*/

@@ -522,6 +526,11 @@  relocate_code:
 	mr	r10, r5	    /* Save copy of Destination Address */

 	GET_GOT
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	mr	r3,  r5	    /* Destination Address		*/
 	lis	r4, CONFIG_SYS_MONITOR_BASE@h	/* Source Address	*/
 	ori	r4, r4, CONFIG_SYS_MONITOR_BASE@l
diff --git a/arch/powerpc/cpu/mpc824x/start.S b/arch/powerpc/cpu/mpc824x/start.S
index fc4e922..cc98875 100644
--- a/arch/powerpc/cpu/mpc824x/start.S
+++ b/arch/powerpc/cpu/mpc824x/start.S
@@ -183,7 +183,11 @@  in_flash:
 	/*----------------------------------------------------------------------*/

 	GET_GOT			/* initialize GOT access			*/
-
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	/* r3: IMMR */
 	bl	cpu_init_f	/* run low-level CPU init code     (from Flash)	*/

@@ -452,6 +456,11 @@  relocate_code:
 	mr	r10, r5		/* Save copy of Destination Address	*/

 	GET_GOT
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	mr	r3,  r5				/* Destination Address	*/
 #ifdef CONFIG_SYS_RAMBOOT
 	lis	r4, CONFIG_SYS_SDRAM_BASE@h		/* Source      Address	*/
diff --git a/arch/powerpc/cpu/mpc8260/start.S b/arch/powerpc/cpu/mpc8260/start.S
index 702546e..23151cd 100644
--- a/arch/powerpc/cpu/mpc8260/start.S
+++ b/arch/powerpc/cpu/mpc8260/start.S
@@ -236,7 +236,11 @@  in_flash:
 	/*--------------------------------------------------------------*/

 	GET_GOT			/* initialize GOT access		*/
-
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	/* r3: IMMR */
 	bl	cpu_init_f	/* run low-level CPU init code (in Flash)*/

diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S
index 7e60315..a9acb83 100644
--- a/arch/powerpc/cpu/mpc83xx/start.S
+++ b/arch/powerpc/cpu/mpc83xx/start.S
@@ -285,7 +285,11 @@  in_flash:
 	/*------------------------------------------------------*/

 	GET_GOT			/* initialize GOT access	*/
-
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	/* r3: IMMR */
 	lis	r3, CONFIG_SYS_IMMR@h
 	/* run low-level CPU init code (in Flash)*/
@@ -822,6 +826,11 @@  relocate_code:
 	mr	r10, r5		/* Save copy of Destination Address */

 	GET_GOT
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	mr	r3,  r5				/* Destination Address */
 	lis	r4, CONFIG_SYS_MONITOR_BASE@h		/* Source      Address */
 	ori	r4, r4, CONFIG_SYS_MONITOR_BASE@l
diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S
index 5777493..3623357 100644
--- a/arch/powerpc/cpu/mpc85xx/start.S
+++ b/arch/powerpc/cpu/mpc85xx/start.S
@@ -421,6 +421,11 @@  _start_cont:
 	stw	r0,+12(r1)		/* Save return addr (underflow vect) */

 	GET_GOT
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	bl	cpu_init_early_f

 	/* switch back to AS = 0 */
@@ -921,6 +926,11 @@  relocate_code:
 	mr	r10,r5		/* Save copy of Destination Address	*/

 	GET_GOT
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	mr	r3,r5				/* Destination Address	*/
 	lis	r4,CONFIG_SYS_MONITOR_BASE@h		/* Source      Address	*/
 	ori	r4,r4,CONFIG_SYS_MONITOR_BASE@l
diff --git a/arch/powerpc/cpu/mpc86xx/start.S b/arch/powerpc/cpu/mpc86xx/start.S
index 3e3c21e..2ec7fd4 100644
--- a/arch/powerpc/cpu/mpc86xx/start.S
+++ b/arch/powerpc/cpu/mpc86xx/start.S
@@ -255,7 +255,11 @@  addr_trans_enabled:
 	stwu	r0, -4(r1)	/* stack backtraces terminate cleanly	*/

 	GET_GOT			/* initialize GOT access	*/
-
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	/* run low-level CPU init code	   (from Flash) */
 	bl	cpu_init_f
 	sync
@@ -620,6 +624,11 @@  relocate_code:
 	mr	r10, r5		/* Save copy of Destination Address	*/

 	GET_GOT
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	mr	r3,  r5				/* Destination Address	*/
 	lis	r4, CONFIG_SYS_MONITOR_BASE@h		/* Source      Address	*/
 	ori	r4, r4, CONFIG_SYS_MONITOR_BASE@l
diff --git a/arch/powerpc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S
index fe3daa2..f8256bf 100644
--- a/arch/powerpc/cpu/mpc8xx/start.S
+++ b/arch/powerpc/cpu/mpc8xx/start.S
@@ -188,7 +188,11 @@  in_flash:
 	/*----------------------------------------------------------------------*/

 	GET_GOT			/* initialize GOT access			*/
-
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	/* r3: IMMR */
 	bl	cpu_init_f	/* run low-level CPU init code     (from Flash)	*/

@@ -473,6 +477,11 @@  relocate_code:
 	mr	r10, r5		/* Save copy of Destination Address	*/

 	GET_GOT
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	mr	r3,  r5				/* Destination Address	*/
 	lis	r4, CONFIG_SYS_MONITOR_BASE@h		/* Source      Address	*/
 	ori	r4, r4, CONFIG_SYS_MONITOR_BASE@l
diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S
index b43e22c..aa03d9a 100644
--- a/arch/powerpc/cpu/ppc4xx/start.S
+++ b/arch/powerpc/cpu/ppc4xx/start.S
@@ -262,6 +262,11 @@ 
 	bl	reconfig_tlb0
 #endif
 	GET_GOT
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	bl	cpu_init_f	/* run low-level CPU init code	   (from Flash) */
 	bl	board_init_f
 	/* NOTREACHED - board_init_f() does not return */
@@ -799,7 +804,11 @@  _start:
 	ori	r0,r0, RESET_VECTOR@l
 	stwu	r1,-8(r1)		/* Save back chain and move SP */
 	stw	r0,+12(r1)		/* Save return addr (underflow vect) */
-
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 #ifdef CONFIG_NAND_SPL
 	bl	nand_boot_common	/* will not return */
 #else
@@ -914,7 +923,11 @@  _start:
 	stwu	r0, -4(r1)		/* stack backtraces terminate cleanly	*/

 	GET_GOT			/* initialize GOT access			*/
-
+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 	bl	board_init_f	/* run first part of init code (from Flash)	*/
 	/* NOTREACHED - board_init_f() does not return */

@@ -1179,6 +1192,11 @@  _start:
 	stw	r0, +12(r1)		/* Save return addr (underflow vect) */
 #endif /* CONFIG_SYS_INIT_DCACHE_CS */

+#if defined(__pic__) && __pic__ == 1
+	/* Needed for upcoming -msingle-pic-base */
+	bl	_GLOBAL_OFFSET_TABLE_@local-4
+	mflr	r30
+#endif
 #ifdef CONFIG_NAND_SPL
 	bl	nand_boot_common	/* will not return */
 #else