From a84a99b9948fa431bbcadf39f5216b04b3eb1d52 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 26 May 2009 14:03:51 +0000 Subject: Various fixes to the tree to get coreboot-v2 to build on Solaris - Replace $(PWD) with $(CURDIR) in Makefiles. I don't know why the Solaris version behaves differently, but CURDIR is a safe choice on gnu make (and we require gnu make already) - Use tail -1 instead of tail -n1 in a file that already relies on tail -1 support in another place - Use tail -1 as alternative to tail -n1 in another place - Use #define for ulong_t in romcc, as that name is used on Solaris - Avoid fprinting a null pointer. The standard doesn't mandate that this is a special case, and Solaris doesn't implement it that way. Signed-off-by: Patrick Georgi Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4305 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- util/romcc/romcc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'util/romcc') diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c index bc647fd75b..5ab94274af 100644 --- a/util/romcc/romcc.c +++ b/util/romcc/romcc.c @@ -280,7 +280,7 @@ typedef uint16_t ushort_t; typedef int32_t int_t; typedef uint32_t uint_t; typedef int32_t long_t; -typedef uint32_t ulong_t; +#define ulong_t uint32_t #define SCHAR_T_MIN (-128) #define SCHAR_T_MAX 127 @@ -24819,8 +24819,8 @@ static void print_instructions(struct compile_state *state) last_occurance != ins->occurance) { if (!ins->occurance->parent) { fprintf(fp, "\t/* %s,%s:%d.%d */\n", - ins->occurance->function, - ins->occurance->filename, + ins->occurance->function?ins->occurance->function:"(null)", + ins->occurance->filename?ins->occurance->filename:"(null)", ins->occurance->line, ins->occurance->col); } -- cgit v1.2.3