[coreboot-gerrit] Patch set updated for coreboot: coreinfo: use coreboot crosscompiler

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12454

-gerrit

commit 47fb707980980c736a39a7719ff432e7e2a46d56
Author: Martin Roth <martinroth at google.com>
Date:   Mon Nov 16 22:33:48 2015 -0700

    coreinfo: use coreboot crosscompiler
    
    Set up coreinfo makefile to use .xcompile and the coreboot 32-bit cross
    compiler toolchain.
    
    Restrict to x86_32 gcc compiler.
    
    Tested in QEMU
    
    Change-Id: I1cc180a5eeaf6cb9a36fdcef70a9819d0f459168
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 payloads/coreinfo/Makefile | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile
index 507e535..6573a41 100644
--- a/payloads/coreinfo/Makefile
+++ b/payloads/coreinfo/Makefile
@@ -49,23 +49,43 @@ HOSTCXXFLAGS := -I$(srck) -I$(objk)
 
 LIBCONFIG_PATH := ../libpayload
 LIBPAYLOAD_DIR := build/libpayload
-LPCC := $(LIBPAYLOAD_DIR)/libpayload/bin/lpgcc
-LPAS := $(LIBPAYLOAD_DIR)/libpayload/bin/lpas
 HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD_DIR)/libpayload/lib/libpayload.a)
 LIB_CONFIG ?= defconfig
 OBJCOPY ?= objcopy
 
 INCLUDES = -I$(obj) -include $(LIBPAYLOAD_DIR)/libpayload/include/kconfig.h
-CFLAGS := -Wall -Werror -Os -fno-builtin $(INCLUDES)
 OBJECTS = cpuinfo_module.o cpuid.S.o pci_module.o coreboot_module.o \
 	  nvram_module.o bootlog_module.o ramdump_module.o lar_module.o \
 	  multiboot_module.o cbfs_module.o coreinfo.o
 OBJS    = $(patsubst %,$(obj)/%,$(OBJECTS))
 TARGET  = $(obj)/coreinfo.elf
 
+all: real-all
+
+# in addition to the dependency below, create the file if it doesn't exist
+# to silence warnings about a file that would be generated anyway.
+$(if $(wildcard .xcompile),,$(eval $(shell ../../util/xcompile/xcompile $(XGCCPATH) > .xcompile || rm -f .xcompile)))
+.xcompile: ../../util/xcompile/xcompile
+	$< $(XGCCPATH) > $@.tmp
+	\mv -f $@.tmp $@ 2> /dev/null || rm -f $@.tmp $@
+
+CONFIG_COMPILER_GCC := y
+ARCH-y     := x86_32
+
+include .xcompile
+
+CC := $(CC_$(ARCH-y))
+AS := $(AS_$(ARCH-y))
+OBJCOPY := $(OBJCOPY_$(ARCH-y))
+
+LPCC := CC=$(CC) $(LIBPAYLOAD_DIR)/libpayload/bin/lpgcc
+LPAS := AS=$(AS) $(LIBPAYLOAD_DIR)/libpayload/bin/lpas
+
+CFLAGS += -Wall -Werror -Os -fno-builtin $(CFLAGS_$(ARCH-y)) $(INCLUDES)
+
 ifneq ($(strip $(HAVE_DOTCONFIG)),)
 include $(src)/.config
-all: $(TARGET)
+real-all: $(TARGET)
 
 $(TARGET): $(src)/.config $(obj)/config.h $(OBJS) libpayload
 	printf "    LPCC       $(subst $(shell pwd)/,,$(@)) (LINK)\n"
@@ -83,7 +103,7 @@ $(obj)/%.o: $(src)/%.c libpayload
 	$(LPCC) $(CFLAGS) -c -o $@ $<
 
 else
-all: config
+real-all: config
 endif
 
 ifneq ($(strip $(HAVE_LIBPAYLOAD)),)