[coreboot] r64 - in trunk/filo: . util/kconfig
svn at coreboot.org
svn at coreboot.org
Tue Sep 23 23:30:26 CEST 2008
Author: oxygene
Date: 2008-09-23 23:30:25 +0200 (Tue, 23 Sep 2008)
New Revision: 64
Modified:
trunk/filo/Makefile
trunk/filo/util/kconfig/expr.h
trunk/filo/util/kconfig/zconf.tab.c_shipped
Log:
1.
Preset CC to gcc in Makefile. There are some $(shell $(CC) ...)
invocations with GCC specific options, so that shouldn't hurt.
2.
Replace stdbool.h include in util/kconfig/expr.h by a custom
implementation of booleans. This is okay as these booleans are purely
internal. It's necessary because there's some disagreement between the
Solaris headers and GCC on Solaris, about when stdbool.h is appropriate.
3.
Remove stdbool.h include from util/kconfig/zconf.tab.c_shipped. This
file includes expr.h already, so it picks up the right set of
primitives, without duplicating the special case for Solaris.
Signed-off-by: Patrick Georgi <patrick.georgi at coresystems.de>
Acked-by: Peter Stuge <peter at stuge.se>
Modified: trunk/filo/Makefile
===================================================================
--- trunk/filo/Makefile 2008-09-18 08:04:13 UTC (rev 63)
+++ trunk/filo/Makefile 2008-09-23 21:30:25 UTC (rev 64)
@@ -41,6 +41,7 @@
Q := @
endif
+CC = gcc
HOSTCC = gcc
HOSTCXX = g++
HOSTCFLAGS := -I$(srck) -I$(objk)
Modified: trunk/filo/util/kconfig/expr.h
===================================================================
--- trunk/filo/util/kconfig/expr.h 2008-09-18 08:04:13 UTC (rev 63)
+++ trunk/filo/util/kconfig/expr.h 2008-09-23 21:30:25 UTC (rev 64)
@@ -12,8 +12,13 @@
#include <stdio.h>
#ifndef __cplusplus
+#ifndef __sun
#include <stdbool.h>
+#else
+typedef short bool;
+enum { true=1, false=0};
#endif
+#endif
struct file {
struct file *next;
Modified: trunk/filo/util/kconfig/zconf.tab.c_shipped
===================================================================
--- trunk/filo/util/kconfig/zconf.tab.c_shipped 2008-09-18 08:04:13 UTC (rev 63)
+++ trunk/filo/util/kconfig/zconf.tab.c_shipped 2008-09-23 21:30:25 UTC (rev 64)
@@ -158,7 +158,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <stdbool.h>
#define LKC_DIRECT_LINK
#include "lkc.h"
More information about the coreboot
mailing list