commit e2eea6d51e21dada2aa33ceada4ae5c77a489640
author Vadim Bendebury <vbendeb@chromium.org> Mon May 23 21:39:11 2011
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Mon May 23 21:39:11 2011
tree a8016984f93a8d797855e065710320b7d5861517
parent 14496edd0a559100660a12d7fb1f7be4389d4154
parent 8fc093bc7e3a8921f436db9316f40b2ad4c777ae

Merge "Fix seabios build problems."

src/util.c

diff --git a/src/util.c b/src/util.c
index ed73d63..bac833c 100644
--- a/src/util.c
+++ b/src/util.c
@@ -174,7 +174,7 @@
         : "cc", "memory");
 }
 
-inline void
+void
 memcpy_fl(void *d_fl, const void *s_fl, size_t len)
 {
     if (MODESEGMENT)

tools/test-gcc.sh

diff --git a/tools/test-gcc.sh b/tools/test-gcc.sh
index ce3497b..6b14f8f 100755
--- a/tools/test-gcc.sh
+++ b/tools/test-gcc.sh
@@ -8,11 +8,16 @@
 TMPFILE2o=out/tmp_testcompile2.o
 TMPFILE3o=out/tmp_testcompile3.o
 
+report_error() {
+  this_prog=$(basename $0)
+  (1>&2 echo "********* $this_prog: $* *******" )
+}
+
 # Test for "-fwhole-program".  Older versions of gcc (pre v4.1) don't
 # support the whole-program optimization - detect that.
 $CC -fwhole-program -S -o /dev/null -xc /dev/null > /dev/null 2>&1
 if [ $? -ne 0 ]; then
-    echo "  Working around no -fwhole-program" > /dev/fd/2
+    report_error "  Working around no -fwhole-program"
     echo 2
     exit 0
 fi
@@ -36,7 +41,7 @@
 $CC -Os -c -fwhole-program $TMPFILE2 -o $TMPFILE2o > /dev/null 2>&1
 $CC -nostdlib -Os $TMPFILE1o $TMPFILE2o -o $TMPFILE3o > /dev/null 2>&1
 if [ $? -ne 0 ]; then
-    echo "  Working around non-functional -fwhole-program" > /dev/fd/2
+    report_error "  Working around non-functional -fwhole-program"
     echo 2
     exit 0
 fi
@@ -71,7 +76,7 @@
 if [ $? -eq 0 ]; then
     echo 0
 else
-    echo "  Working around non-functional -combine" > /dev/fd/2
+    report_error "  Working around non-functional -combine"
     echo 1
 fi