From 59549598c08d5bdcee01bfb91dd9d147edf9fee7 Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <stepan@openbios.org>
Date: Wed, 17 Sep 2003 12:18:40 +0000
Subject: fix romcc compiling 32bit code on amd64

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1118 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 util/romcc/romcc.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'util/romcc')

diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c
index c721a21002..2b14506c50 100644
--- a/util/romcc/romcc.c
+++ b/util/romcc/romcc.c
@@ -208,8 +208,13 @@ static char *slurp_file(const char *dirname, const char *filename, off_t *r_size
 }
 
 /* Long on the destination platform */
+#ifdef __x86_64__
+typedef unsigned int ulong_t;
+typedef int long_t;
+#else
 typedef unsigned long ulong_t;
 typedef long long_t;
+#endif
 
 struct file_state {
 	struct file_state *prev;
@@ -861,7 +866,11 @@ struct compile_state {
  * type-> holds the number of elements.
  */
 
+#ifdef __x86_64__
+#define ELEMENT_COUNT_UNSPECIFIED (~0U)
+#else
 #define ELEMENT_COUNT_UNSPECIFIED (~0UL)
+#endif
 
 struct type {
 	unsigned int type;
@@ -2952,8 +2961,13 @@ static long_t mprimary_expr(struct compile_state *state, int index)
 		meat(state, index, TOK_LIT_INT);
 		errno = 0;
 		val = strtol(state->token[index].val.str, &end, 0);
+#ifdef __x86_64__
+		if (((val == INT_MIN) || (val == INT_MAX)) &&
+			(errno == ERANGE)) {
+#else
 		if (((val == LONG_MIN) || (val == LONG_MAX)) &&
 			(errno == ERANGE)) {
+#endif
 			error(state, 0, "Integer constant to large");
 		}
 		break;
@@ -7101,7 +7115,11 @@ static struct triple *integer_constant(struct compile_state *state)
 	errno = 0;
 	decimal = (tk->val.str[0] != '0');
 	val = strtoul(tk->val.str, &end, 0);
+#ifdef __x86_64__
+	if ((val == UINT_MAX) && (errno == ERANGE)) {
+#else
 	if ((val == ULONG_MAX) && (errno == ERANGE)) {
+#endif
 		error(state, 0, "Integer constant to large");
 	}
 	u = l = 0;
@@ -7125,7 +7143,11 @@ static struct triple *integer_constant(struct compile_state *state)
 	}
 	else if (l) {
 		type = &long_type;
+#ifdef __x86_64__
+		if (!decimal && (val > INT_MAX)) {
+#else
 		if (!decimal && (val > LONG_MAX)) {
+#endif
 			type = &ulong_type;
 		}
 	}
@@ -7140,7 +7162,11 @@ static struct triple *integer_constant(struct compile_state *state)
 		if (!decimal && (val > INT_MAX) && (val <= UINT_MAX)) {
 			type = &uint_type;
 		}
+#ifdef __x86_64__
+		else if (!decimal && (val > INT_MAX)) {
+#else
 		else if (!decimal && (val > LONG_MAX)) {
+#endif
 			type = &ulong_type;
 		}
 		else if (val > INT_MAX) {
-- 
cgit v1.2.3