diff options
author | Sebastien Carlier <sebastien.carlier@gmail.com> | 2010-11-05 15:48:07 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-11-17 21:02:18 +0100 |
commit | 6d8962e814c15807dd6ac5757904be2a02d187b8 (patch) | |
tree | b899a91461cdc9b35a424cb45a28864da7889137 /board/tqc | |
parent | d7b1970015e62d37b26bb6b94b64ae36728c63cc (diff) |
Switch from archive libraries to partial linking
Before this commit, weak symbols were not overridden by non-weak symbols
found in archive libraries when linking with recent versions of
binutils. As stated in the System V ABI, "the link editor does not
extract archive members to resolve undefined weak symbols".
This commit changes all Makefiles to use partial linking (ld -r) instead
of creating library archives, which forces all symbols to participate in
linking, allowing non-weak symbols to override weak symbols as intended.
This approach is also used by Linux, from which the gmake function
cmd_link_o_target (defined in config.mk and used in all Makefiles) is
inspired.
The name of each former library archive is preserved except for
extensions which change from ".a" to ".o". This commit updates
references accordingly where needed, in particular in some linker
scripts.
This commit reveals board configurations that exclude some features but
include source files that depend these disabled features in the build,
resulting in undefined symbols. Known such cases include:
- disabling CMD_NET but not CMD_NFS;
- enabling CONFIG_OF_LIBFDT but not CONFIG_QE.
Signed-off-by: Sebastien Carlier <sebastien.carlier@gmail.com>
Diffstat (limited to 'board/tqc')
-rw-r--r-- | board/tqc/tqm5200/Makefile | 4 | ||||
-rw-r--r-- | board/tqc/tqm8260/Makefile | 4 | ||||
-rw-r--r-- | board/tqc/tqm8272/Makefile | 4 | ||||
-rw-r--r-- | board/tqc/tqm834x/Makefile | 4 | ||||
-rw-r--r-- | board/tqc/tqm85xx/Makefile | 4 | ||||
-rw-r--r-- | board/tqc/tqm8xx/Makefile | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/board/tqc/tqm5200/Makefile b/board/tqc/tqm5200/Makefile index 55c4d99a8f..d0e68c31a2 100644 --- a/board/tqc/tqm5200/Makefile +++ b/board/tqc/tqm5200/Makefile @@ -23,7 +23,7 @@ include $(TOPDIR)/config.mk -LIB = $(obj)lib$(BOARD).a +LIB = $(obj)lib$(BOARD).o COBJS := $(BOARD).o cmd_stk52xx.o cmd_tb5200.o cam5200_flash.o @@ -32,7 +32,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) $(LIB): $(obj).depend $(OBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) + $(call cmd_link_o_target, $(OBJS)) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/tqc/tqm8260/Makefile b/board/tqc/tqm8260/Makefile index 94ba1e94e9..d5b6df6868 100644 --- a/board/tqc/tqm8260/Makefile +++ b/board/tqc/tqm8260/Makefile @@ -26,7 +26,7 @@ ifneq ($(OBJTREE),$(SRCTREE)) $(shell mkdir -p $(obj)../tqm8xx/) endif -LIB = $(obj)lib$(BOARD).a +LIB = $(obj)lib$(BOARD).o COBJS = $(BOARD).o ../tqm8xx/load_sernum_ethaddr.o @@ -35,7 +35,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) $(LIB): $(obj).depend $(OBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) + $(call cmd_link_o_target, $(OBJS)) ######################################################################### diff --git a/board/tqc/tqm8272/Makefile b/board/tqc/tqm8272/Makefile index c97fe1496d..d2a90d538b 100644 --- a/board/tqc/tqm8272/Makefile +++ b/board/tqc/tqm8272/Makefile @@ -26,7 +26,7 @@ ifneq ($(OBJTREE),$(SRCTREE)) $(shell mkdir -p $(obj)../tqm8xx/) endif -LIB = $(obj)lib$(BOARD).a +LIB = $(obj)lib$(BOARD).o COBJS = $(BOARD).o ../tqm8xx/load_sernum_ethaddr.o nand.o @@ -35,7 +35,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) $(LIB): $(obj).depend $(OBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) + $(call cmd_link_o_target, $(OBJS)) ######################################################################### diff --git a/board/tqc/tqm834x/Makefile b/board/tqc/tqm834x/Makefile index 011e63136b..bce53a49e2 100644 --- a/board/tqc/tqm834x/Makefile +++ b/board/tqc/tqm834x/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk -LIB = $(obj)lib$(BOARD).a +LIB = $(obj)lib$(BOARD).o COBJS-y += $(BOARD).o COBJS-$(CONFIG_PCI) += pci.o @@ -36,7 +36,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) $(LIB): $(obj).depend $(OBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) + $(call cmd_link_o_target, $(OBJS)) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/tqc/tqm85xx/Makefile b/board/tqc/tqm85xx/Makefile index adda9d45b7..a40a89575b 100644 --- a/board/tqc/tqm85xx/Makefile +++ b/board/tqc/tqm85xx/Makefile @@ -23,7 +23,7 @@ include $(TOPDIR)/config.mk -LIB = $(obj)lib$(BOARD).a +LIB = $(obj)lib$(BOARD).o COBJS-y += $(BOARD).o COBJS-y += sdram.o @@ -38,7 +38,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) $(LIB): $(obj).depend $(OBJS) $(SOBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) + $(call cmd_link_o_target, $(OBJS)) clean: rm -f $(OBJS) $(SOBJS) diff --git a/board/tqc/tqm8xx/Makefile b/board/tqc/tqm8xx/Makefile index 280982dd41..888cf24810 100644 --- a/board/tqc/tqm8xx/Makefile +++ b/board/tqc/tqm8xx/Makefile @@ -23,7 +23,7 @@ include $(TOPDIR)/config.mk -LIB = $(obj)lib$(BOARD).a +LIB = $(obj)lib$(BOARD).o COBJS = $(BOARD).o load_sernum_ethaddr.o @@ -32,7 +32,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) $(LIB): $(obj).depend $(OBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) + $(call cmd_link_o_target, $(OBJS)) ######################################################################### |