powerpc: Add support for -msingle-pic-base
PATCH 1/1 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 <[email protected]>
---
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(-)
arch/powerpc/config.mk +1 -0
@@ -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
arch/powerpc/cpu/74xx_7xx/start.S +10 -1
@@ -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
arch/powerpc/cpu/mpc512x/start.S +10 -1
@@ -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
arch/powerpc/cpu/mpc5xx/start.S +10 -1
@@ -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
arch/powerpc/cpu/mpc5xxx/start.S +10 -1
@@ -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
arch/powerpc/cpu/mpc8220/start.S +10 -1
@@ -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
arch/powerpc/cpu/mpc824x/start.S +10 -1
@@ -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 */
arch/powerpc/cpu/mpc8260/start.S +5 -1
@@ -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)*/
arch/powerpc/cpu/mpc83xx/start.S +10 -1
@@ -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
arch/powerpc/cpu/mpc85xx/start.S +10 -0
@@ -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
arch/powerpc/cpu/mpc86xx/start.S +10 -1
@@ -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
arch/powerpc/cpu/mpc8xx/start.S +10 -1
@@ -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
arch/powerpc/cpu/ppc4xx/start.S +20 -2
@@ -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_ 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 */
@@ -799,7 +804,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
@@ -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_ 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 */
@@ -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_ at local-4 + mflr r30 +#endif #ifdef CONFIG_NAND_SPL bl nand_boot_common /* will not return */ #else
--
1.7.3.4