From 68a564f7ac3975de5ce6e6d0f65db63bbe7d2d64 Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <stepan@coresystems.de>
Date: Tue, 16 Mar 2010 01:02:18 +0000
Subject: [PATCH] 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 <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5215 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 Makefile                        |  8 +++-----
 src/arch/i386/lib/printk_init.c |  1 -
 src/console/printk.c            |  9 ---------
 src/console/vsprintf.c          |  1 -
 src/console/vtxprintf.c         |  1 -
 src/include/console/vtxprintf.h | 12 ++++++++++++
 6 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 46f6b49aa8..cf038e88a3 100644
--- a/Makefile
+++ b/Makefile
@@ -63,9 +63,7 @@ HOSTCC = gcc
 HOSTCXX = g++
 HOSTCFLAGS := -I$(srck) -I$(objk) -g
 HOSTCXXFLAGS := -I$(srck) -I$(objk)
-LIBGCC_FILE_NAME := $(shell $(CC) -print-libgcc-file-name)
-
-DESTDIR = /opt
+LIBGCC_FILE_NAME := $(shell test -r `$(CC) -print-libgcc-file-name` && $(CC) -print-libgcc-file-name)
 
 DOXYGEN := doxygen
 DOXYGEN_OUTPUT_DIR := doxygen
@@ -281,20 +279,20 @@ printall:
 	@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
diff --git a/src/arch/i386/lib/printk_init.c b/src/arch/i386/lib/printk_init.c
index dd4672736b..aa9d5b5a5a 100644
--- a/src/arch/i386/lib/printk_init.c
+++ b/src/arch/i386/lib/printk_init.c
@@ -17,7 +17,6 @@
  * MA 02110-1301 USA
  */
 
-#include <stdarg.h>
 #include <console/console.h>
 #include <console/vtxprintf.h>
 #include <console/loglevel.h>
diff --git a/src/console/printk.c b/src/console/printk.c
index 886e2cfa72..488d4e5ca3 100644
--- a/src/console/printk.c
+++ b/src/console/printk.c
@@ -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;
 
diff --git a/src/console/vsprintf.c b/src/console/vsprintf.c
index 090063cf62..7407c420ab 100644
--- a/src/console/vsprintf.c
+++ b/src/console/vsprintf.c
@@ -19,7 +19,6 @@
  * MA 02110-1301 USA
  */
 
-#include <stdarg.h>
 #include <string.h>
 #include <smp/spinlock.h>
 #include <console/vtxprintf.h>
diff --git a/src/console/vtxprintf.c b/src/console/vtxprintf.c
index b1b53b6a39..3c75e3d704 100644
--- a/src/console/vtxprintf.c
+++ b/src/console/vtxprintf.c
@@ -4,7 +4,6 @@
  *  Copyright (C) 1991, 1992  Linus Torvalds
  */
 
-#include <stdarg.h>
 #include <string.h>
 #include <div64.h>
 #include <console/vtxprintf.h>
diff --git a/src/include/console/vtxprintf.h b/src/include/console/vtxprintf.h
index c949c12115..f7d58bbd6a 100644
--- a/src/include/console/vtxprintf.h
+++ b/src/include/console/vtxprintf.h
@@ -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);