gcc 4.1 fixes.

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2177 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/config/Options.lb b/src/config/Options.lb
index 8f307063f825d0e0edb62d8544442c92f768a861..33e132b33eb7e9b7cc955c6a042adcbdfb9573f6 100644 (file)
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -146,7 +146,7 @@ define LINUXBIOS_COMPILER
        comment "Build compiler"
 end
 define LINUXBIOS_LINKER
-       default "$(shell  $(CC) -Wl,-v 2>&1 | grep version | tail -n 1)"
+       default "$(shell  $(CC) -Wl,--version 2>&1 | grep version | tail -n 1)"
        export always
        format "\"%s\""
        comment "Build linker"

diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c
index a28da889d413ee729cd128780597d4d1bb61df0f..e72ce90c6678b5f8947105eff36079523fb67cfb 100644 (file)
--- a/util/romcc/romcc.c
+++ b/util/romcc/romcc.c
@@ -7627,7 +7627,7 @@ static struct triple *mkland_expr(
        val = read_expr(state, var);
 
        /* Generate the prog for a logical and */
-       def = mkprog(state, var, lstore, jmp, mid, rstore, end, val, 0);
+       def = mkprog(state, var, lstore, jmp, mid, rstore, end, val, 0UL);
        
        return def;
 }
@@ -7656,7 +7656,7 @@ static struct triple *mklor_expr(
        val = read_expr(state, var);
 
        /* Generate the prog for a logical or */
-       def = mkprog(state, var, left, jmp, mid, right, end, val, 0);
+       def = mkprog(state, var, left, jmp, mid, right, end, val, 0UL);
 
        return def;
 }
@@ -7722,7 +7722,7 @@ static struct triple *mkcond_expr(
        val = read_expr(state, var);
 
        /* Generate the prog for a conditional expression */
-       def = mkprog(state, var, jmp1, top, left, jmp2, mid, right, end, val, 0);
+       def = mkprog(state, var, jmp1, top, left, jmp2, mid, right, end, val, 0UL);
 
        return def;
 }
@@ -11588,7 +11588,7 @@ static struct triple *expr(struct compile_state *state)
        def = assignment_expr(state);
        while(peek(state) == TOK_COMMA) {
                eat(state, TOK_COMMA);
-               def = mkprog(state, def, assignment_expr(state), 0);
+               def = mkprog(state, def, assignment_expr(state), 0UL);
        }
        return def;
 }