Move libgcc inclusion from common Makefile to platform configs files
PATCH 1/2 Move libgcc inclusion from common Makefile to platform configs files
This patch moves the libgcc Makefile inclusion from the toplevel Makefile to the arch_config.mk files. This is in preparation for the ARM architecture to move away from including libgcc function and only using self-contained U-Boot functions as done in Linux.
Currently in the next branch all the ARM boards that use the nand are broken due to the adding of the 64 Bit device size support. In the past we have seen problems with different toolchains due to EABI, FPU as example. With this patch and the following one we move away from all these problems and we will be able to have full control to have a functions embedded into u-boot.
--- Makefile | 2 +- api_examples/Makefile | 4 +--- arm_config.mk | 2 ++ avr32_config.mk | 2 ++ blackfin_config.mk | 2 ++ board/netstar/Makefile | 4 +--- board/sl8245/config.mk | 1 - board/trab/Makefile | 2 -- board/voiceblue/Makefile | 4 +--- examples/Makefile | 2 +- i386_config.mk | 2 ++ m68k_config.mk | 2 ++ microblaze_config.mk | 2 ++ mips_config.mk | 2 ++ nios2_config.mk | 2 ++ nios_config.mk | 2 ++ ppc_config.mk | 2 ++ sh_config.mk | 2 ++ sparc_config.mk | 2 ++ 19 files changed, 29 insertions(+), 14 deletions(-)
Makefile +1 -1
@@ -280,7 +280,7 @@ LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).a LIBBOARD := $(addprefix $(obj),$(LIBBOARD)) # Add GCC lib -PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc +PLATFORM_LIBS += $(PLATFORM_LIBGCC) # The "tools" are needed early, so put this first # Don't include stuff already done in $(LIBS)
api_examples/Makefile +1 -3
@@ -56,8 +56,6 @@ OBJS := $(addprefix $(obj),$(COBJS)) ELF := $(addprefix $(obj),$(ELF)) BIN := $(addprefix $(obj),$(BIN)) -gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`) - CPPFLAGS += -I.. all: $(obj).depend $(OBJS) $(LIB) $(ELF) $(BIN)
@@ -70,7 +68,7 @@ $(ELF): $(obj)%: $(obj)%.o $(LIB) $(LD) $(obj)crt0.o -Ttext $(LOAD_ADDR) \ -o $@ $< $(LIB) \ - -L$(gcclibdir) -lgcc + $(PLATFORM_LIBGCC) $(BIN): $(obj)%.bin: $(obj)%
arm_config.mk +2 -0
@@ -24,3 +24,5 @@ PLATFORM_CPPFLAGS += -DCONFIG_ARM -D__ARM__ LDSCRIPT := $(SRCTREE)/cpu/$(CPU)/u-boot.lds + +PLATFORM_LIBGCC += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
avr32_config.mk +2 -0
@@ -23,3 +23,5 @@ PLATFORM_RELFLAGS += -ffixed-r5 -fPIC -mno-init-got -mrelax PLATFORM_LDFLAGS += --relax + +PLATFORM_LIBGCC += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
blackfin_config.mk +2 -0
@@ -49,3 +49,5 @@ LDR_FLAGS += --quiet endif LDR_FLAGS += $(LDR_FLAGS-y) + +PLATFORM_LIBGCC += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
board/netstar/Makefile +1 -3
@@ -36,8 +36,6 @@ SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) eeprom.c \ OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) -gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`) - LOAD_ADDR = 0x10400000 LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/eeprom.lds lnk = $(if $(obj),$(obj),.)
@@ -55,7 +53,7 @@ $(obj)eeprom.srec: $(obj)eeprom.o $(obj)eeprom_start.o -o $(<:.o=) -e eeprom eeprom.o eeprom_start.o \ -L$(obj)../../examples -lstubs \ -L$(obj)../../lib_generic -lgeneric \ - -L$(gcclibdir) -lgcc + $(PLATFROM_LIBGCC) $(OBJCOPY) -O srec $(<:.o=) $@ $(obj)eeprom.bin: $(obj)eeprom.srec
board/sl8245/config.mk +0 -1
@@ -28,4 +28,3 @@ TEXT_BASE = 0xFFF00000 PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -PLATFORM_LIBS += $(shell $(CC) -print-libgcc-file-name)
board/trab/Makefile +0 -2
@@ -36,8 +36,6 @@ SOBJS := $(addprefix $(obj),$(SOBJS)) OBJS_FKT := $(addprefix $(obj),$(COBJS_FKT)) -gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`) - LOAD_ADDR = 0xc100000 #########################################################################
board/voiceblue/Makefile +1 -3
@@ -33,8 +33,6 @@ SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) eeprom.c eeprom_start.S OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) -gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`) - LOAD_ADDR = 0x10400000 LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/eeprom.lds lnk = $(if $(obj),$(obj),.)
@@ -49,7 +47,7 @@ $(obj)eeprom.srec: $(obj)eeprom.o $(obj)eeprom_start.o -o $(<:.o=) -e eeprom eeprom.o eeprom_start.o \ -L$(obj)../../examples -lstubs \ -L$(obj)../../lib_generic -lgeneric \ - -L$(gcclibdir) -lgcc + $(PLATFROM_LIBGCC) $(OBJCOPY) -O srec $(<:.o=) $@ $(obj)eeprom.bin: $(obj)eeprom.srec
examples/Makefile +1 -1
@@ -178,7 +178,7 @@ $(ELF): $(obj)%: $(obj)%.o $(LIB) $(LD) -g $(EX_LDFLAGS) -Ttext $(LOAD_ADDR) \ -o $@ -e $(SYM_PREFIX)$(notdir $(<:.o=)) $< $(LIB) \ - -L$(gcclibdir) -lgcc + $(PLATFORM_LIBGCC) $(SREC): $(obj)%.srec: $(obj)%
i386_config.mk +2 -0
@@ -22,3 +22,5 @@ # PLATFORM_CPPFLAGS += -DCONFIG_I386 -D__I386__ + +PLATFORM_LIBGCC += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
m68k_config.mk +2 -0
@@ -23,3 +23,5 @@ PLATFORM_CPPFLAGS += -DCONFIG_M68K -D__M68K__ PLATFORM_LDFLAGS += -n + +PLATFORM_LIBGCC += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
microblaze_config.mk +2 -0
@@ -25,3 +25,5 @@ # PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__ + +PLATFORM_LIBGCC += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
mips_config.mk +2 -0
@@ -23,6 +23,8 @@ PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__MIPS__ +PLATFORM_LIBGCC += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc + # # From Linux arch/mips/Makefile #
nios2_config.mk +2 -0
@@ -24,3 +24,5 @@ PLATFORM_CPPFLAGS += -DCONFIG_NIOS2 -D__NIOS2__ PLATFORM_CPPFLAGS += -ffixed-r15 -G0 + +PLATFORM_LIBGCC += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
nios_config.mk +2 -0
@@ -23,3 +23,5 @@ # PLATFORM_CPPFLAGS += -m32 -DCONFIG_NIOS -D__NIOS__ -ffixed-g7 -gstabs + +PLATFORM_LIBGCC += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
ppc_config.mk +2 -0
@@ -24,6 +24,8 @@ PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__ PLATFORM_LDFLAGS += -n +PLATFORM_LIBGCC += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc + # # When cross-compiling on NetBSD, we have to define __PPC__ or else we # will pick up a va_list declaration that is incompatible with the
sh_config.mk +2 -0
@@ -22,3 +22,5 @@ # PLATFORM_CPPFLAGS += -DCONFIG_SH -D__SH__ + +PLATFORM_LIBGCC += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
sparc_config.mk +2 -0
@@ -22,3 +22,5 @@ # PLATFORM_CPPFLAGS += -DCONFIG_SPARC -D__sparc__ + +PLATFORM_LIBGCC += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
Signature · 1 line
1.6.3.1
PATCH 2/2 ARM: Don't include libgcc anymore
This patch removes the inclusion of libgcc functions into U-Boot on the ARM architecture. Only the really needed functions are provided in the lib_arm directory. Those implementations are copied from Linux where they are well proven related to reliably, performance.
---
Makefile | 11 +-
arm_config.mk | 2 +-
board/trab/u-boot.lds | 2 +-
include/asm-arm/assembler.h | 116 ++++++++++++
include/asm-arm/linkage.h | 11 ++
include/linux/linkage.h | 95 ++++++++++
lib_arm/Makefile | 10 +-
lib_arm/_divsi3.S | 140 ---------------
lib_arm/_modsi3.S | 99 -----------
lib_arm/_udivsi3.S | 77 --------
lib_arm/_umodsi3.S | 88 ----------
lib_arm/{_ashldi3.S => ashldi3.S} | 9 +-
lib_arm/{_ashrdi3.S => ashrdi3.S} | 9 +-
lib_arm/lib1funcs.S | 348 +++++++++++++++++++++++++++++++++++++
lib_arm/{_ashrdi3.S => lshrdi3.S} | 13 +-
15 files changed, 607 insertions(+), 423 deletions(-)
create mode 100644 include/asm-arm/assembler.h
create mode 100644 include/asm-arm/linkage.h
create mode 100644 include/linux/linkage.h
delete mode 100644 lib_arm/_divsi3.S
delete mode 100644 lib_arm/_modsi3.S
delete mode 100644 lib_arm/_udivsi3.S
delete mode 100644 lib_arm/_umodsi3.S
rename lib_arm/{_ashldi3.S => ashldi3.S} (93%)
copy lib_arm/{_ashrdi3.S => ashrdi3.S} (93%)
create mode 100644 lib_arm/lib1funcs.S
rename lib_arm/{_ashrdi3.S => lshrdi3.S} (90%)Makefile +8 -3
@@ -220,7 +220,6 @@ endif ifeq ($(CPU),ixp) LIBS += cpu/ixp/npe/libnpe.a endif -LIBS += lib_$(ARCH)/lib$(ARCH).a LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \ fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a fs/yaffs2/libyaffs2.a \ fs/ubifs/libubifs.a
@@ -279,6 +278,9 @@ LIBS := $(addprefix $(obj),$(LIBS)) LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).a LIBBOARD := $(addprefix $(obj),$(LIBBOARD)) +LIBARCH = lib_$(ARCH)/lib$(ARCH).a +LIBARCH := $(addprefix $(obj),$(LIBARCH)) + # Add GCC lib PLATFORM_LIBS += $(PLATFORM_LIBGCC)
@@ -301,7 +303,7 @@ U_BOOT_ONENAND = $(obj)u-boot-onenand.bin endif __OBJS := $(subst $(obj),,$(OBJS)) -__LIBS := $(subst $(obj),,$(LIBS)) $(subst $(obj),,$(LIBBOARD)) +__LIBS := $(subst $(obj),,$(LIBS)) $(subst $(obj),,$(LIBBOARD)) $(subst $(obj),,$(LIBARCH)) ######################################################################### #########################################################################
@@ -354,13 +356,16 @@ $(obj)u-boot: depend $(SUBDIRS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT) $(OBJS): depend $(MAKE) -C cpu/$(CPU) $(if $(REMOTE_BUILD),$@,$(notdir $@)) +$(LIBARCH): depend + $(MAKE) -C $(dir $(subst $(obj),,$@)) + $(LIBS): depend $(SUBDIRS) $(MAKE) -C $(dir $(subst $(obj),,$@)) $(LIBBOARD): depend $(LIBS) $(MAKE) -C $(dir $(subst $(obj),,$@)) -$(SUBDIRS): depend +$(SUBDIRS): depend $(LIBARCH) $(MAKE) -C $@ all $(LDSCRIPT): depend
arm_config.mk +1 -1
@@ -25,4 +25,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_ARM -D__ARM__ LDSCRIPT := $(SRCTREE)/cpu/$(CPU)/u-boot.lds -PLATFORM_LIBGCC += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc +PLATFORM_LIBGCC += -L$(OBJTREE)/lib_arm -larm
board/trab/u-boot.lds +1 -1
@@ -33,7 +33,7 @@ SECTIONS .text : { cpu/arm920t/start.o (.text) - lib_arm/_umodsi3.o (.text) + lib_arm/lib1funcs.o (.text) lib_generic/zlib.o (.text) lib_generic/crc32.o (.text) lib_generic/string.o (.text)
include/asm-arm/assembler.h new file +116 -0
116 lines not on this page · raw message
include/asm-arm/linkage.h new file +11 -0
@@ -0,0 +1,11 @@ +#ifndef __ASM_LINKAGE_H +#define __ASM_LINKAGE_H + +#define __ALIGN .align 0 +#define __ALIGN_STR ".align 0" + +#define ENDPROC (name) \ + .type name, %function; \ + END(name) + +#endif
include/linux/linkage.h new file +95 -0
95 lines not on this page · raw message
lib_arm/Makefile +4 -6
@@ -25,12 +25,10 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(ARCH).a -SOBJS-y += _ashldi3.o -SOBJS-y += _ashrdi3.o -SOBJS-y += _divsi3.o -SOBJS-y += _modsi3.o -SOBJS-y += _udivsi3.o -SOBJS-y += _umodsi3.o +SOBJS-y += lib1funcs.o +SOBJS-y += ashldi3.o +SOBJS-y += ashrdi3.o +SOBJS-y += lshrdi3.o COBJS-y += board.o COBJS-y += bootm.o
lib_arm/_divsi3.S deleted +0 -140
140 lines not on this page · raw message
lib_arm/_modsi3.S deleted +0 -99
99 lines not on this page · raw message
lib_arm/_udivsi3.S deleted +0 -77
77 lines not on this page · raw message
lib_arm/_umodsi3.S deleted +0 -88
88 lines not on this page · raw message
lib_arm/ashldi3.S renamed from lib_arm/_ashldi3.S +7 -2
@@ -26,6 +26,8 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <linux/linkage.h> + #ifdef __ARMEB__ #define al r1 #define ah r0
@@ -34,8 +36,8 @@ Boston, MA 02110-1301, USA. */ #define ah r1 #endif -.globl __ashldi3 -__ashldi3: +ENTRY(__ashldi3) +ENTRY(__aeabi_llsl) subs r3, r2, #32 rsb ip, r2, #32
@@ -44,3 +46,6 @@ __ashldi3: orrmi ah, ah, al, lsr ip mov al, al, lsl r2 mov pc, lr + +ENDPROC(__ashldi3) +ENDPROC(__aeabi_llsl)
lib_arm/ashrdi3.S renamed from lib_arm/_ashrdi3.S +7 -2
@@ -26,6 +26,8 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <linux/linkage.h> + #ifdef __ARMEB__ #define al r1 #define ah r0
@@ -34,8 +36,8 @@ Boston, MA 02110-1301, USA. */ #define ah r1 #endif -.globl __ashrdi3 -__ashrdi3: +ENTRY(__ashrdi3) +ENTRY(__aeabi_lasr) subs r3, r2, #32 rsb ip, r2, #32
@@ -44,3 +46,6 @@ __ashrdi3: orrmi al, al, ah, lsl ip mov ah, ah, asr r2 mov pc, lr + +ENDPROC(__ashrdi3) +ENDPROC(__aeabi_lasr)
lib_arm/lib1funcs.S new file +348 -0
348 lines not on this page · raw message
lib_arm/lshrdi3.S renamed from lib_arm/_ashrdi3.S +9 -4
@@ -26,6 +26,8 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <linux/linkage.h> + #ifdef __ARMEB__ #define al r1 #define ah r0
@@ -34,13 +36,16 @@ Boston, MA 02110-1301, USA. */ #define ah r1 #endif -.globl __ashrdi3 -__ashrdi3: +ENTRY(__lshrdi3) +ENTRY(__aeabi_llsr) subs r3, r2, #32 rsb ip, r2, #32 movmi al, al, lsr r2 - movpl al, ah, asr r3 + movpl al, ah, lsr r3 orrmi al, al, ah, lsl ip - mov ah, ah, asr r2 + mov ah, ah, lsr r2 mov pc, lr + +ENDPROC(__lshrdi3) +ENDPROC(__aeabi_llsr)
Signature · 1 line
1.6.3.1
PATCH 2/2 ARM: Don't include libgcc anymore
Quoted 7 lines · On Wednesday 10 June 2009 13:59:14 Jean-Christophe PLAGNIOL-VILLARD wrote:
This patch removes the inclusion of libgcc functions into U-Boot on the ARM architecture. Only the really needed functions are provided in the
lib_armdirectory. Those implementations are copied from Linux where they are well proven related to reliably, performance.Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Stefan Roese <[email protected]>
Thanks.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
PATCH 1/2 Move libgcc inclusion from common Makefile to platform configs files
In reply to Jean-Christophe PLAGNIOL-VILLARDQuoted 12 lines · On Wednesday 10 June 2009 13:59:13 Jean-Christophe PLAGNIOL-VILLARD wrote:
This patch moves the libgcc
Makefileinclusion from the toplevelMakefileto the arch_config.mk files. This is in preparation for the ARM architecture to move away from including libgcc function and only using self-contained U-Boot functions as done in Linux.Currently in the next branch all the ARM boards that use the nand are broken due to the adding of the 64 Bit device size support. In the past we have seen problems with different toolchains due to EABI, FPU as example. With this patch and the following one we move away from all these problems and we will be able to have full control to have a functions embedded into u-boot.
Quoted 2 lines
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Stefan Roese <[email protected]>
Thanks.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================