summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--arch/x86/Makefile11
2 files changed, 1 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index a5402992..c7a44fbd 100644
--- a/Makefile
+++ b/Makefile
@@ -282,7 +282,7 @@ XBUILD_CFLAGS += -Wno-unneeded-internal-declaration
XBUILD_CFLAGS += $(call xbuild_check_cc_option,-fno-PIE)
XBUILD_CFLAGS += $(call xbuild_check_cc_option,-Qunused-arguments)
-XBUILD_LDFLAGS += -static -nostdlib
+XBUILD_LDFLAGS += -static -nostdlib -lgcc
# Disable the build ID feature of the linker
XBUILD_LDFLAGS += -Wl,--build-id=none
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index daf862d8..4ae88532 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -20,21 +20,10 @@ XBUILD_LDFLAGS += -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096
ifeq ($(CONFIG_X86_32),y)
biarch := $(call cc-option,-m32)
-
XBUILD_CPPFLAGS += -m32
-
- XBUILD_LDFLAGS += -lgcc
else
biarch := -m64
-
XBUILD_CPPFLAGS += -m64
-
- # XXX The kernel isn't linked with libgcc on amd64, because libgcc
- # uses red zones. But since there are actually very few functions
- # provided by libgcc on amd64, it was decided to just not link with
- # it. If it turns out that libgcc is really needed some day, the
- # kernel can somewhat easily be changed to support red zones.
- XBUILD_CFLAGS += -mno-red-zone
XBUILD_CFLAGS += -mcmodel=kernel
endif