diff --git a/Makefile b/Makefile index 2413ed62943e7d4ae6898e33d839a8b051e9b177..dc023a9bb3b92545f9887437527c5e587f79b3cf 100644 --- a/Makefile +++ b/Makefile @@ -312,7 +312,7 @@ $(obj)u-boot.dis: $(obj)u-boot $(OBJDUMP) -d $< > $@ $(obj)u-boot: depend $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT) - UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) |sed -n -e 's/.*\(__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\ + UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) |sed -n -e 's/.*\($(SYM_PREFIX)__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\ cd $(LNDIR) && $(LD) $(LDFLAGS) $$UNDEF_SYM $(__OBJS) \ --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \ -Map u-boot.map -o u-boot diff --git a/blackfin_config.mk b/blackfin_config.mk index beb9498e77f9bf42074198592d9731a12951e1f0..e91318e9b4db39c0b0a0edd6f384e4adea8f1d3c 100644 --- a/blackfin_config.mk +++ b/blackfin_config.mk @@ -23,3 +23,5 @@ PLATFORM_RELFLAGS += -ffixed-P5 PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN + +SYM_PREFIX = _ diff --git a/examples/Makefile b/examples/Makefile index 79af4b07cd3d71dc176b704ec205344ff2348ac0..d63fa703232a92af2069e76fd52a006252650e60 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -162,7 +162,7 @@ $(LIB): $(obj).depend $(LIBOBJS) $(ELF): $(obj)%: $(obj)%.o $(LIB) $(LD) -g $(EX_LDFLAGS) -Ttext $(LOAD_ADDR) \ - -o $@ -e $(notdir $(<:.o=)) $< $(LIB) \ + -o $@ -e $(SYM_PREFIX)$(notdir $(<:.o=)) $< $(LIB) \ -L$(gcclibdir) -lgcc $(SREC):