Author: kilgour Date: 2008-02-12 03:36:00 +0100 (Tue, 12 Feb 2008) New Revision: 4
Modified: trunk/openvsa/common.mk trunk/openvsa/sysmgr/Makefile trunk/openvsa/vsm.mk Log: [openvsa] Fix for 64 bit hosts, and add in our good friend -fno-stack-protector Signed-off-by: Jordan Crouse <[EMAIL PROTECTED]> Acked-by: Peter Stuge <[EMAIL PROTECTED]> Modified: trunk/openvsa/common.mk =================================================================== --- trunk/openvsa/common.mk 2008-02-12 02:32:16 UTC (rev 3) +++ trunk/openvsa/common.mk 2008-02-12 02:36:00 UTC (rev 4) @@ -20,11 +20,26 @@ # <http://www.gnu.org/licenses/>. # +# Borrowed from the kernel + +try-run= $(shell set -e; \ + TMP=".$$$$.tmp"; \ + if ($(1)) > /dev/null 2>&1; \ + then echo "$(2)"; \ + else echo "$(3)"; \ + fi; rm -rf "$$TMP") + + +cc-option= $(call try-run, \ + $(CC) $(1) -S -xc /dev/null -o "$$TMP", $(1), $(2)) + CC = gcc INCS = $(addprefix -I, ../inc ../sysmgr) ARCH = i586 -CFLAGS += -Wall -Werror -fno-strict-aliasing -march=$(ARCH) -Os $(INCS) +CFLAGS += -m32 -Wall -Werror -fno-strict-aliasing -march=$(ARCH) -Os $(INCS) +LDFLAGS += -melf_i386 +CFLAGS += $(call cc-option, -fno-stack-protector,) # -------------------------------------------------------------------------- SMMDC_TRANSLATE = ../smimac.pl < $< > tmp_$< Modified: trunk/openvsa/sysmgr/Makefile =================================================================== --- trunk/openvsa/sysmgr/Makefile 2008-02-12 02:32:16 UTC (rev 3) +++ trunk/openvsa/sysmgr/Makefile 2008-02-12 02:36:00 UTC (rev 4) @@ -39,7 +39,7 @@ EXTRA_CLEANS = $(INIT_ASM_OBJ) vsainit.bin : $(INIT_ASM_OBJ) vsainit.lnk - $(LD) --cref --oformat binary -Map vsainit.map \ + $(LD) $(LDFLAGS) --cref --oformat binary -Map vsainit.map \ -o $@ -T vsainit.lnk $(INIT_ASM_OBJ) clean:: $(RM) vsainit.map @@ -59,7 +59,7 @@ # Note: gcc 4.1.1 barfs on chipset.c with '-Os' chipset.o : chipset.c @mkdir -p .deps - $(CC) -march=$(ARCH) $(INCS) -MD -c -o $@ $< + $(CC) -m32 -march=$(ARCH) $(INCS) -MD -c -o $@ $< @cp chipset.d .deps/chipset.P; \ sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ -e '/^$$/ d' -e 's/$$/ :/' < chipset.d >> \ Modified: trunk/openvsa/vsm.mk =================================================================== --- trunk/openvsa/vsm.mk 2008-02-12 02:32:16 UTC (rev 3) +++ trunk/openvsa/vsm.mk 2008-02-12 02:36:00 UTC (rev 4) @@ -27,7 +27,7 @@ all : $(VSM).vsm $(EXTRA_BIN) $(VSM).vsm : $(ASM_OBJ) $(C_OBJ) ../vsm_lib/vsm.a $(VSM).lnk - $(LD) --cref --oformat binary -Map $(VSM).map \ + $(LD) $(LDFLAGS) --cref --oformat binary -Map $(VSM).map \ -o $@ -T $(VSM).lnk $(ASM_OBJ) $(C_OBJ) ../vsm_lib/vsm.a ../vsm_lib/vsm.a: -- coreboot mailing list [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
