[U-Boot] [PATCH] PowerPC: Add support for -msingle-pic-base
Joakim Tjernlund
Joakim.Tjernlund at transmode.se
Mon Dec 6 18:35:37 CET 2010
-msingle-pic-base is a new gcc option for ppc and
it reduces the size of my u-boot with 6-8 KB.
While at it, add -fno-jump-tables too to save a
few more bytes.
-msingle-pic-base will be 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 at transmode.se>
---
arch/powerpc/config.mk | 2 ++
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, 127 insertions(+), 12 deletions(-)
diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk
index b04e968..b5087d6 100644
--- a/arch/powerpc/config.mk
+++ b/arch/powerpc/config.mk
@@ -26,6 +26,8 @@ CROSS_COMPILE ?= ppc_8xx-
STANDALONE_LOAD_ADDR = 0x40000
PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections -fdata-sections
+PLATFORM_RELFLAGS += $(call cc-option,-msingle-pic-base,)
+PLATFORM_RELFLAGS += $(call cc-option,-fno-jump-tables,)
PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__
PLATFORM_LDFLAGS += -n --gc-sections
diff --git a/arch/powerpc/cpu/74xx_7xx/start.S b/arch/powerpc/cpu/74xx_7xx/start.S
index 985e1ce..bd10d18 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_ at 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_ at local-4
+ mflr r30
+#endif
mr r3, r5 /* Destination Address */
lis r4, CONFIG_SYS_MONITOR_BASE at h /* Source Address */
ori r4, r4, CONFIG_SYS_MONITOR_BASE at l
diff --git a/arch/powerpc/cpu/mpc512x/start.S b/arch/powerpc/cpu/mpc512x/start.S
index 10557cf..fe8941e 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_ at local-4
+ mflr r30
+#endif
/* r3: IMMR */
lis r3, CONFIG_SYS_IMMR at 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_ at local-4
+ mflr r30
+#endif
mr r3, r5 /* Destination Address */
lis r4, CONFIG_SYS_MONITOR_BASE at h /* Source Address */
ori r4, r4, CONFIG_SYS_MONITOR_BASE at l
diff --git a/arch/powerpc/cpu/mpc5xx/start.S b/arch/powerpc/cpu/mpc5xx/start.S
index 3dbd23d..7dcb076 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_ at 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_ at local-4
+ mflr r30
+#endif
mr r3, r5 /* Destination Address */
lis r4, CONFIG_SYS_MONITOR_BASE at h /* Source Address */
ori r4, r4, CONFIG_SYS_MONITOR_BASE at l
diff --git a/arch/powerpc/cpu/mpc5xxx/start.S b/arch/powerpc/cpu/mpc5xxx/start.S
index 38c0bd7..8250580 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_ at 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_ at local-4
+ mflr r30
+#endif
mr r3, r5 /* Destination Address */
lis r4, CONFIG_SYS_MONITOR_BASE at h /* Source Address */
ori r4, r4, CONFIG_SYS_MONITOR_BASE at l
diff --git a/arch/powerpc/cpu/mpc8220/start.S b/arch/powerpc/cpu/mpc8220/start.S
index ca42678..7e940d3 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_ at 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_ at local-4
+ mflr r30
+#endif
mr r3, r5 /* Destination Address */
lis r4, CONFIG_SYS_MONITOR_BASE at h /* Source Address */
ori r4, r4, CONFIG_SYS_MONITOR_BASE at l
diff --git a/arch/powerpc/cpu/mpc824x/start.S b/arch/powerpc/cpu/mpc824x/start.S
index 0dd1300..cab0eef 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_ at 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_ at local-4
+ mflr r30
+#endif
mr r3, r5 /* Destination Address */
#ifdef CONFIG_SYS_RAMBOOT
lis r4, CONFIG_SYS_SDRAM_BASE at h /* Source Address */
diff --git a/arch/powerpc/cpu/mpc8260/start.S b/arch/powerpc/cpu/mpc8260/start.S
index 255a15e..b924798 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_ at 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 460ac9a..0c8e884 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_ at local-4
+ mflr r30
+#endif
/* r3: IMMR */
lis r3, CONFIG_SYS_IMMR at 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_ at local-4
+ mflr r30
+#endif
mr r3, r5 /* Destination Address */
lis r4, CONFIG_SYS_MONITOR_BASE at h /* Source Address */
ori r4, r4, CONFIG_SYS_MONITOR_BASE at l
diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S
index 945c1b8..d4ef4ea 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_ at 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_ at local-4
+ mflr r30
+#endif
mr r3,r5 /* Destination Address */
lis r4,CONFIG_SYS_MONITOR_BASE at h /* Source Address */
ori r4,r4,CONFIG_SYS_MONITOR_BASE at l
diff --git a/arch/powerpc/cpu/mpc86xx/start.S b/arch/powerpc/cpu/mpc86xx/start.S
index 4c29de6..198275c 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_ at 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_ at local-4
+ mflr r30
+#endif
mr r3, r5 /* Destination Address */
lis r4, CONFIG_SYS_MONITOR_BASE at h /* Source Address */
ori r4, r4, CONFIG_SYS_MONITOR_BASE at l
diff --git a/arch/powerpc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S
index 6a16c26..206d287 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_ at 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_ at local-4
+ mflr r30
+#endif
mr r3, r5 /* Destination Address */
lis r4, CONFIG_SYS_MONITOR_BASE at h /* Source Address */
ori r4, r4, CONFIG_SYS_MONITOR_BASE at l
diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S
index 0e75794..03d07a4 100644
--- a/arch/powerpc/cpu/ppc4xx/start.S
+++ b/arch/powerpc/cpu/ppc4xx/start.S
@@ -260,6 +260,11 @@
bl reconfig_tlb0
#endif
GET_GOT
+#if defined(__pic__) && __pic__ == 1
+ /* Needed for upcoming -msingle-pic-base */
+ bl _GLOBAL_OFFSET_TABLE_ at 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 */
@@ -797,7 +802,11 @@ _start:
ori r0,r0, RESET_VECTOR at 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_ at local-4
+ mflr r30
+#endif
#ifdef CONFIG_NAND_SPL
bl nand_boot_common /* will not return */
#else
@@ -912,7 +921,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_ at local-4
+ mflr r30
+#endif
bl board_init_f /* run first part of init code (from Flash) */
/* NOTREACHED - board_init_f() does not return */
@@ -1177,6 +1190,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_ at local-4
+ mflr r30
+#endif
#ifdef CONFIG_NAND_SPL
bl nand_boot_common /* will not return */
#else
--
1.7.2.2
More information about the U-Boot
mailing list