From a25ae71f990aaf1aca999941ece3551f7b8ce269 Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Thu, 12 Mar 2015 12:07:09 -0700 Subject: [PATCH] Linux: support ld.gold The -Ur option is not supported in gold Signed-off-by: Mark Charlebois --- makefiles/toolchain_native.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/makefiles/toolchain_native.mk b/makefiles/toolchain_native.mk index a2bd5a4bc7..db40689acc 100644 --- a/makefiles/toolchain_native.mk +++ b/makefiles/toolchain_native.mk @@ -81,7 +81,7 @@ CPP = clang$(CLANGVER) -E DEV_VER_SUPPORTED = 4.2.1 endif -LD = ld +LD = ld.gold AR = ar rcs NM = nm OBJCOPY = objcopy @@ -282,10 +282,11 @@ endef # Produce partially-linked $1 from files in $2 # +#$(Q) $(LD) -Ur -o $1 $2 # -Ur not supported in ld.gold define PRELINK @$(ECHO) "PRELINK: $1" @$(MKDIR) -p $(dir $1) - $(Q) $(LD) -Ur -o $1 $2 + $(Q) $(LD) -r -o $1 $2 endef # $(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1