See patch... This patch allows me to compile coreboot with LLVM/clang.
To actually use LLVM/clang, I just hard coded it in xcompile for now:
Index: util/xcompile/xcompile
===================================================================
--- util/xcompile/xcompile (revision 5209)
+++ util/xcompile/xcompile (working copy)
@@ -87,7 +87,8 @@
cat << EOF
# elf${TWIDTH}-${TARCH} toolchain
AS:=${GCCPREFIX}as ${ASFLAGS}
-CC:=${GCCPREFIX}gcc ${CFLAGS}
+#CC:=${GCCPREFIX}gcc ${CFLAGS}
+CC:=clang -m32
CPP:=${GCCPREFIX}cpp
AR:=${GCCPREFIX}ar
LD:=${GCCPREFIX}ld ${LDFLAGS}
--
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: [email protected] • http://www.coresystems.de/
Registergericht: Amtsgericht Freiburg • HRB 7656
Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866
This patch is what I needed to compile coreboot with LLVM.
- call va_* directly if coreboot is running on GCC so we don't need
to maintain hacks to get to stdarg.h
- only define LIBGCC_FILE_NAME if it's an absolute path. GCC and LLVM
just print "libgcc.a" if the file is not there.
Signed-off-by: Stefan Reinauer <[email protected]>
Index: src/include/console/vtxprintf.h
===================================================================
--- src/include/console/vtxprintf.h (revision 5209)
+++ src/include/console/vtxprintf.h (working copy)
@@ -20,7 +20,19 @@
#ifndef __CONSOLE_VTXPRINTF_H
#define __CONSOLE_VTXPRINTF_H
+/* With GCC we use -nostdinc -ffreestanding to keep out system includes.
+ * Unfortunately this also gets us rid of the _compiler_ includes, like
+ * stdarg.h. To work around the issue, we define varargs directly here.
+ * On LLVM we can still just include stdarg.h.
+ */
+#ifdef __GNUC__
+#define va_start(v,l) __builtin_va_start(v,l)
+#define va_end(v) __builtin_va_end(v)
+#define va_arg(v,l) __builtin_va_arg(v,l)
+typedef __builtin_va_list va_list;
+#else
#include <stdarg.h>
+#endif
int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list
args);
Index: src/console/vtxprintf.c
===================================================================
--- src/console/vtxprintf.c (revision 5209)
+++ src/console/vtxprintf.c (working copy)
@@ -4,7 +4,6 @@
* Copyright (C) 1991, 1992 Linus Torvalds
*/
-#include <stdarg.h>
#include <string.h>
#include <div64.h>
#include <console/vtxprintf.h>
Index: src/console/printk.c
===================================================================
--- src/console/printk.c (revision 5209)
+++ src/console/printk.c (working copy)
@@ -5,19 +5,10 @@
*
*/
-#include <stdarg.h>
#include <smp/spinlock.h>
#include <console/vtxprintf.h>
#include <console/console.h>
-/* printk's without a loglevel use this.. */
-#define DEFAULT_MESSAGE_LOGLEVEL 4 /* BIOS_WARNING */
-
-/* We show everything that is MORE important than this.. */
-#define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
-
-/* Keep together for sysctl support */
-
int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
int default_console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
Index: src/console/vsprintf.c
===================================================================
--- src/console/vsprintf.c (revision 5209)
+++ src/console/vsprintf.c (working copy)
@@ -19,7 +19,6 @@
* MA 02110-1301 USA
*/
-#include <stdarg.h>
#include <string.h>
#include <smp/spinlock.h>
#include <console/vtxprintf.h>
Index: src/arch/i386/lib/printk_init.c
===================================================================
--- src/arch/i386/lib/printk_init.c (revision 5209)
+++ src/arch/i386/lib/printk_init.c (working copy)
@@ -17,7 +17,6 @@
* MA 02110-1301 USA
*/
-#include <stdarg.h>
#include <console/console.h>
#include <console/vtxprintf.h>
#include <console/loglevel.h>
Index: Makefile
===================================================================
--- Makefile (revision 5209)
+++ Makefile (working copy)
@@ -63,10 +63,8 @@
HOSTCXX = g++
HOSTCFLAGS := -I$(srck) -I$(objk) -g
HOSTCXXFLAGS := -I$(srck) -I$(objk)
-LIBGCC_FILE_NAME := $(shell $(CC) -print-libgcc-file-name)
+LIBGCC_FILE_NAME := $(shell test -r `$(CC) -print-libgcc-file-name` && $(CC)
-print-libgcc-file-name)
-DESTDIR = /opt
-
DOXYGEN := doxygen
DOXYGEN_OUTPUT_DIR := doxygen
@@ -281,20 +279,20 @@
@echo smmobjs:=$(smmobjs)
@echo alldirs:=$(alldirs)
@echo allsrc=$(allsrc)
+ @echo LIBGCC_FILE_NAME=$(LIBGCC_FILE_NAME)
printcrt0s:
@echo $(patsubst $(top)/%,%,$(crt0s))
OBJS := $(patsubst %,$(obj)/%,$(TARGETS-y))
INCLUDES := -I$(top)/src -I$(top)/src/include -I$(obj)
-I$(top)/src/arch/$(ARCHDIR-y)/include
-INCLUDES += -I$(shell $(CC) -print-search-dirs | head -n 1 | cut -d' '
-f2)include
INCLUDES += -I$(top)/util/x86emu/include
INCLUDES += -include $(obj)/config.h
CFLAGS = $(INCLUDES) -Os -nostdinc
CFLAGS += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes
CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs
-CFLAGS += -Wstrict-aliasing -Wshadow
+CFLAGS += -Wstrict-aliasing -Wshadow
ifeq ($(CONFIG_WARNINGS_ARE_ERRORS),y)
CFLAGS += -Werror
endif
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
