|
@@ -35,7 +35,7 @@ ifeq ($(SRCARCH),x86)
|
|
|
ifeq (${IS_64_BIT}, 1)
|
|
|
CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT -DHAVE_SYSCALL_TABLE -I$(OUTPUT)arch/x86/include/generated
|
|
|
ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S
|
|
|
- LIBUNWIND_LIBS = -lunwind -lunwind-x86_64
|
|
|
+ LIBUNWIND_LIBS = -lunwind-x86_64 -lunwind -llzma
|
|
|
$(call detected,CONFIG_X86_64)
|
|
|
else
|
|
|
LIBUNWIND_LIBS = -lunwind-x86 -llzma -lunwind
|
|
@@ -505,6 +505,10 @@ ifndef NO_LOCAL_LIBUNWIND
|
|
|
EXTLIBS += $(LIBUNWIND_LIBS)
|
|
|
LDFLAGS += $(LIBUNWIND_LIBS)
|
|
|
endif
|
|
|
+ifeq ($(findstring -static,${LDFLAGS}),-static)
|
|
|
+ # gcc -static links libgcc_eh which contans piece of libunwind
|
|
|
+ LIBUNWIND_LDFLAGS += -Wl,--allow-multiple-definition
|
|
|
+endif
|
|
|
|
|
|
ifndef NO_LIBUNWIND
|
|
|
CFLAGS += -DHAVE_LIBUNWIND_SUPPORT
|