diff --git a/arch/x86_64/src/Makefile b/arch/x86_64/src/Makefile
index 111b39a2a0..973de0fa8e 100644
--- a/arch/x86_64/src/Makefile
+++ b/arch/x86_64/src/Makefile
@@ -97,6 +97,10 @@ ifeq ($(CONFIG_LIBSUPCXX),y)
   EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
 endif
 
+ifeq ($(CONFIG_CXX_EXCEPTION),y)
+  EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc_eh.a}}
+endif
+
 VPATH = chip:common:$(ARCH_SUBDIR)
 
 all: libarch$(LIBEXT)
diff --git a/arch/x86_64/src/common/Toolchain.defs b/arch/x86_64/src/common/Toolchain.defs
index 5a4450aa58..bd6a3e5778 100644
--- a/arch/x86_64/src/common/Toolchain.defs
+++ b/arch/x86_64/src/common/Toolchain.defs
@@ -138,6 +138,8 @@ AFLAGS += -Wa,--divide
 endif
 
 EXEEXT = .elf
+	
+LDFLAGS += -nostdlib -static
 
 # Loadable module definitions