From 522a86e54a4d8836cce099efa37a92b7bb2fb63d Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Fri, 14 Dec 2012 15:17:01 +0100 Subject: [PATCH] base-linux: use the Genode GCC's crt files With this patch hybrid applications get linked with the Genode GCC's 'crtbegin.o' and 'crtend.o' files instead of the host GCC's versions to avoid compatibility problems. This only affects the 'linux_x86' platform, since on the 'lx_hybrid_x86' platform the Genode GCC is the host GCC. Fixes #550. --- base-linux/lib/import/import-lx_hybrid.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base-linux/lib/import/import-lx_hybrid.mk b/base-linux/lib/import/import-lx_hybrid.mk index 2005f33d4..1abc38c75 100644 --- a/base-linux/lib/import/import-lx_hybrid.mk +++ b/base-linux/lib/import/import-lx_hybrid.mk @@ -80,13 +80,13 @@ endif ifneq ($(filter hardening_tool_chain, $(SPECS)),) EXT_OBJECTS += $(shell cc $(CC_MARCH) -print-file-name=Scrt1.o) EXT_OBJECTS += $(shell cc $(CC_MARCH) -print-file-name=crti.o) -EXT_OBJECTS += $(shell cc $(CC_MARCH) -print-file-name=crtbeginS.o) -EXT_OBJECTS += $(shell cc $(CC_MARCH) -print-file-name=crtendS.o) +EXT_OBJECTS += $(shell $(CUSTOM_CC) $(CC_MARCH) -print-file-name=crtbeginS.o) +EXT_OBJECTS += $(shell $(CUSTOM_CC) $(CC_MARCH) -print-file-name=crtendS.o) else EXT_OBJECTS += $(shell cc $(CC_MARCH) -print-file-name=crt1.o) EXT_OBJECTS += $(shell cc $(CC_MARCH) -print-file-name=crti.o) -EXT_OBJECTS += $(shell cc $(CC_MARCH) -print-file-name=crtbegin.o) -EXT_OBJECTS += $(shell cc $(CC_MARCH) -print-file-name=crtend.o) +EXT_OBJECTS += $(shell $(CUSTOM_CC) $(CC_MARCH) -print-file-name=crtbegin.o) +EXT_OBJECTS += $(shell $(CUSTOM_CC) $(CC_MARCH) -print-file-name=crtend.o) endif EXT_OBJECTS += $(shell cc $(CC_MARCH) -print-file-name=crtn.o) EXT_OBJECTS += -lgcc -lgcc_s -lsupc++ -lc