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 <patrick.georgi@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4305 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/config/Options.lb b/src/config/Options.lb
index a27b15ed8c11759a46357a10f0a6a4e3fd3e9479..f28563a274e0efe7cce337a2e94a5e83081561bd 100644 (file)
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -143,7 +143,7 @@ define COREBOOT_COMPILE_DOMAIN
        comment "Build domain name"
 end
 define COREBOOT_COMPILER
-       default "$(shell $(CC) $(CFLAGS) -v 2>&1 | tail -n 1)"
+       default "$(shell $(CC) $(CFLAGS) -v 2>&1 | tail -1)"
        export always
        format "\"%s\""
        comment "Build compiler"

diff --git a/src/mainboard/amd/dbm690t/Config.lb b/src/mainboard/amd/dbm690t/Config.lb
index 1742bad686f89908664864b2932c361fdb7225ac..b2815c88674385bc365e1bee6e5e79a2ba39c67f 100644 (file)
--- a/src/mainboard/amd/dbm690t/Config.lb
+++ b/src/mainboard/amd/dbm690t/Config.lb
@@ -42,7 +42,7 @@ if HAVE_ACPI_TABLES
        object fadt.o
        makerule dsdt.c
                depends "$(MAINBOARD)/acpi/*.asl"
-               action  "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/acpi/dsdt.asl"
+               action  "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/acpi/dsdt.asl"
                action  "mv dsdt.hex dsdt.c"
        end
        object ./dsdt.o

diff --git a/src/mainboard/amd/pistachio/Config.lb b/src/mainboard/amd/pistachio/Config.lb
index dcd8a9b6615ccf284f32c55c1eafe7e68503e568..68fdb43a0d8a6e4a5a1a5f0d07dad93a682d0356 100644 (file)
--- a/src/mainboard/amd/pistachio/Config.lb
+++ b/src/mainboard/amd/pistachio/Config.lb
@@ -42,7 +42,7 @@ if HAVE_ACPI_TABLES
        object fadt.o
        makerule dsdt.c
                depends "$(MAINBOARD)/acpi/*.asl"
-               action  "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/acpi/dsdt.asl"
+               action  "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/acpi/dsdt.asl"
                action  "mv dsdt.hex dsdt.c"
        end
        object ./dsdt.o

diff --git a/src/mainboard/amd/serengeti_cheetah/Config.lb b/src/mainboard/amd/serengeti_cheetah/Config.lb
index da5a901e3e463a78a4a021d203c71a50ae0a9e1f..d4e6eff01a449956b18111deb488d72a83eafca8 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/Config.lb
+++ b/src/mainboard/amd/serengeti_cheetah/Config.lb
@@ -44,7 +44,7 @@ if HAVE_ACPI_TABLES
         object fadt.o
        makerule dsdt.c
                depends "$(MAINBOARD)/dx/dsdt_lb.dsl"
-               action  "iasl -p $(PWD)/dsdt_lb -tc $(MAINBOARD)/dx/dsdt_lb.dsl"
+               action  "iasl -p $(CURDIR)/dsdt_lb -tc $(MAINBOARD)/dx/dsdt_lb.dsl"
                action  "mv dsdt_lb.hex dsdt.c"
        end
         object ./dsdt.o
@@ -54,21 +54,21 @@ if HAVE_ACPI_TABLES
         if ACPI_SSDTX_NUM
             makerule ssdt2.c
                         depends "$(MAINBOARD)/dx/pci2.asl"
-                        action  "iasl -p $(PWD)/pci2 -tc $(MAINBOARD)/dx/pci2.asl"
+                        action  "iasl -p $(CURDIR)/pci2 -tc $(MAINBOARD)/dx/pci2.asl"
                         action  "perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' pci2.hex"
                         action  "mv pci2.hex ssdt2.c"
             end
             object ./ssdt2.o
             makerule ssdt3.c
                         depends "$(MAINBOARD)/dx/pci3.asl"
-                        action  "iasl -p $(PWD)/pci3 -tc $(MAINBOARD)/dx/pci3.asl"
+                        action  "iasl -p $(CURDIR)/pci3 -tc $(MAINBOARD)/dx/pci3.asl"
                         action  "perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' pci3.hex"
                         action  "mv pci3.hex ssdt3.c"
             end
             object ./ssdt3.o
             makerule ssdt4.c
                         depends "$(MAINBOARD)/dx/pci4.asl"
-                        action  "iasl -p $(PWD)/pci4 -tc $(MAINBOARD)/dx/pci4.asl"
+                        action  "iasl -p $(CURDIR)/pci4 -tc $(MAINBOARD)/dx/pci4.asl"
                         action  "perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' pci4.hex"
                         action  "mv pci4.hex ssdt4.c"
             end

diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb b/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb
index 5c48889bcf3383a851102bbb35084d44bd869a5e..6d3856e7c080b701e8682f9d43945ba3c7a48bdd 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb
@@ -44,7 +44,7 @@ if HAVE_ACPI_TABLES
         object fadt.o
        makerule dsdt.c
                depends "$(MAINBOARD)/dx/dsdt_lb.dsl"
-               action  "iasl -p $(PWD)/dsdt_lb -tc $(MAINBOARD)/dx/dsdt_lb.dsl"
+               action  "iasl -p $(CURDIR)/dsdt_lb -tc $(MAINBOARD)/dx/dsdt_lb.dsl"
                action  "mv dsdt_lb.hex dsdt.c"
        end
         object ./dsdt.o
@@ -54,28 +54,28 @@ if HAVE_ACPI_TABLES
        if ACPI_SSDTX_NUM
        makerule ssdt2.c
                depends "$(MAINBOARD)/dx/pci2.asl"
-               action  "iasl -p $(PWD)/pci2 -tc $(MAINBOARD)/dx/pci2.asl"
+               action  "iasl -p $(CURDIR)/pci2 -tc $(MAINBOARD)/dx/pci2.asl"
                action  "perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' pci2.hex"
                action  "mv pci2.hex ssdt2.c"
        end
        object ./ssdt2.o
        makerule ssdt3.c
                depends "$(MAINBOARD)/dx/pci3.asl"
-               action  "iasl -p $(PWD)/pci3 -tc $(MAINBOARD)/dx/pci3.asl"
+               action  "iasl -p $(CURDIR)/pci3 -tc $(MAINBOARD)/dx/pci3.asl"
                action  "perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' pci3.hex"
                action  "mv pci3.hex ssdt3.c"
        end
        object ./ssdt3.o
        makerule ssdt4.c
                depends "$(MAINBOARD)/dx/pci4.asl"
-               action  "iasl -p $(PWD)/pci4 -tc $(MAINBOARD)/dx/pci4.asl"
+               action  "iasl -p $(CURDIR)/pci4 -tc $(MAINBOARD)/dx/pci4.asl"
                action  "perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' pci4.hex"
                action  "mv pci4.hex ssdt4.c"
        end
        object ./ssdt4.o
        makerule ssdt5.c
                depends "$(MAINBOARD)/dx/pci5.asl"
-               action  "iasl -p $(PWD)/pci5 -tc $(MAINBOARD)/dx/pci5.asl"
+               action  "iasl -p $(CURDIR)/pci5 -tc $(MAINBOARD)/dx/pci5.asl"
                action  "perl -pi -e 's/AmlCode/AmlCode_ssdt5/g' pci5.hex"
                action  "mv pci5.hex ssdt5.c"
        end

diff --git a/src/mainboard/asus/a8v-e_se/Config.lb b/src/mainboard/asus/a8v-e_se/Config.lb
index a1ee61ccb604c87deeea1c88b38131d7948bbf69..fa9a0ab7da6cde0c19c26990738ee9cc8785a619 100644 (file)
--- a/src/mainboard/asus/a8v-e_se/Config.lb
+++ b/src/mainboard/asus/a8v-e_se/Config.lb
@@ -31,7 +31,7 @@ if HAVE_ACPI_TABLES
   object fadt.o
   makerule dsdt.c
     depends "$(MAINBOARD)/dsdt.asl"
-    action  "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/dsdt.asl"
+    action  "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/dsdt.asl"
     action  "mv dsdt.hex dsdt.c"
   end
   object ./dsdt.o

diff --git a/src/mainboard/asus/m2v-mx_se/Config.lb b/src/mainboard/asus/m2v-mx_se/Config.lb
index 461be2b59fd7d18063cb8a05999afd193ecb9d6c..cb7d9b58417bfb94a761ac608f3e8418db83c698 100644 (file)
--- a/src/mainboard/asus/m2v-mx_se/Config.lb
+++ b/src/mainboard/asus/m2v-mx_se/Config.lb
@@ -30,7 +30,7 @@ if HAVE_ACPI_TABLES
   object fadt.o
   makerule dsdt.c
     depends "$(MAINBOARD)/dsdt.asl"
-    action  "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/dsdt.asl"
+    action  "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/dsdt.asl"
     action  "mv dsdt.hex dsdt.c"
   end
   object ./dsdt.o

diff --git a/src/mainboard/iwill/dk8_htx/Config.lb b/src/mainboard/iwill/dk8_htx/Config.lb
index 88c421a93ec7eede1764253cdb23722665a0dd1f..accc6f6b607c6ad3e103ec547cb8c2fcf6eb7317 100644 (file)
--- a/src/mainboard/iwill/dk8_htx/Config.lb
+++ b/src/mainboard/iwill/dk8_htx/Config.lb
@@ -44,7 +44,7 @@ if HAVE_ACPI_TABLES
         object fadt.o
        makerule dsdt.c
                depends "$(MAINBOARD)/dx/dsdt_lb.dsl"
-               action  "iasl -p $(PWD)/dsdt_lb -tc $(MAINBOARD)/dx/dsdt_lb.dsl"
+               action  "iasl -p $(CURDIR)/dsdt_lb -tc $(MAINBOARD)/dx/dsdt_lb.dsl"
                action  "mv dsdt_lb.hex dsdt.c"
        end
         object ./dsdt.o
@@ -54,28 +54,28 @@ if HAVE_ACPI_TABLES
         if ACPI_SSDTX_NUM
             makerule ssdt2.c
                         depends "$(MAINBOARD)/dx/pci2.asl"
-                        action  "iasl -p $(PWD)/pci2 -tc $(MAINBOARD)/dx/pci2.asl"
+                        action  "iasl -p $(CURDIR)/pci2 -tc $(MAINBOARD)/dx/pci2.asl"
                         action  "perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' pci2.hex"
                         action  "mv pci2.hex ssdt2.c"
             end
             object ./ssdt2.o
             makerule ssdt3.c
                         depends "$(MAINBOARD)/dx/pci3.asl"
-                        action  "iasl -p $(PWD)/pci3 -tc $(MAINBOARD)/dx/pci3.asl"
+                        action  "iasl -p $(CURDIR)/pci3 -tc $(MAINBOARD)/dx/pci3.asl"
                         action  "perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' pci3.hex"
                         action  "mv pci3.hex ssdt3.c"
             end
             object ./ssdt3.o
             makerule ssdt4.c
                         depends "$(MAINBOARD)/dx/pci4.asl"
-                        action  "iasl -p $(PWD)/pci4 -tc $(MAINBOARD)/dx/pci4.asl"
+                        action  "iasl -p $(CURDIR)/pci4 -tc $(MAINBOARD)/dx/pci4.asl"
                         action  "perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' pci4.hex"
                         action  "mv pci4.hex ssdt4.c"
             end
             object ./ssdt4.o
             makerule ssdt5.c
                         depends "$(MAINBOARD)/dx/pci5.asl"
-                        action  "iasl -p $(PWD)/pci5 -tc $(MAINBOARD)/dx/pci5.asl"
+                        action  "iasl -p $(CURDIR)/pci5 -tc $(MAINBOARD)/dx/pci5.asl"
                         action  "perl -pi -e 's/AmlCode/AmlCode_ssdt5/g' pci5.hex"
                         action  "mv pci5.hex ssdt5.c"
             end

diff --git a/src/mainboard/kontron/986lcd-m/Config.lb b/src/mainboard/kontron/986lcd-m/Config.lb
index a3eeea177847606ac58525e84d95ee5439f70e6a..1b67906502a9d8a9c970a9d10ee3efb690b00595 100644 (file)
--- a/src/mainboard/kontron/986lcd-m/Config.lb
+++ b/src/mainboard/kontron/986lcd-m/Config.lb
@@ -52,7 +52,7 @@ if HAVE_ACPI_TABLES
        makerule dsdt.c
                depends "$(MAINBOARD)/dsdt.asl"
                action  "iasl -p dsdt -tc $(MAINBOARD)/dsdt.asl"
-               action  "mv $(PWD)/dsdt.hex dsdt.c"
+               action  "mv $(CURDIR)/dsdt.hex dsdt.c"
        end
        object ./dsdt.o
 end

diff --git a/src/mainboard/technexion/tim8690/Config.lb b/src/mainboard/technexion/tim8690/Config.lb
index f82c8f41df79a3eb30fe40c2a0f2902833b5ef19..d18eec931fed78b04b933e646e5f2ca67ff8e4e8 100644 (file)
--- a/src/mainboard/technexion/tim8690/Config.lb
+++ b/src/mainboard/technexion/tim8690/Config.lb
@@ -42,7 +42,7 @@ if HAVE_ACPI_TABLES
        object fadt.o
        makerule dsdt.c
                depends "$(MAINBOARD)/acpi/*.asl"
-               action  "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/acpi/dsdt.asl"
+               action  "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/acpi/dsdt.asl"
                action  "mv dsdt.hex dsdt.c"
        end
        object ./dsdt.o

diff --git a/src/mainboard/tyan/s2891/Config.lb b/src/mainboard/tyan/s2891/Config.lb
index 638c557f298d9285d09ac5c812f9dca36ce296c3..995a22247da6260b4c5bd35c8f6cc73656bfeb7e 100644 (file)
--- a/src/mainboard/tyan/s2891/Config.lb
+++ b/src/mainboard/tyan/s2891/Config.lb
@@ -22,7 +22,7 @@ if HAVE_ACPI_TABLES
         object acpi_tables.o
        makerule dsdt.c
                depends "$(MAINBOARD)/dsdt.dsl"
-               action  "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/dsdt.dsl"
+               action  "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/dsdt.dsl"
                action  "mv dsdt.hex dsdt.c"
        end
         object ./dsdt.o

diff --git a/src/mainboard/tyan/s2892/Config.lb b/src/mainboard/tyan/s2892/Config.lb
index 0f2681fe931ed821122b3cc68212b81ef77d2ac4..c824ede6cce0a544cdbb8499e94d3e606f0d6088 100644 (file)
--- a/src/mainboard/tyan/s2892/Config.lb
+++ b/src/mainboard/tyan/s2892/Config.lb
@@ -23,7 +23,7 @@ if HAVE_ACPI_TABLES
         object acpi_tables.o
        makerule dsdt.c
                depends "$(MAINBOARD)/dsdt.dsl"
-               action  "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/dsdt.dsl"
+               action  "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/dsdt.dsl"
                action  "mv dsdt.hex dsdt.c"
        end
         object ./dsdt.o

diff --git a/src/mainboard/tyan/s2895/Config.lb b/src/mainboard/tyan/s2895/Config.lb
index 5a4d77b5505f14beeb2148f5623208aa7e71c0a9..8edb5d4c59d98a1656099973aeb21d6fe5c7b496 100644 (file)
--- a/src/mainboard/tyan/s2895/Config.lb
+++ b/src/mainboard/tyan/s2895/Config.lb
@@ -18,7 +18,7 @@ if HAVE_ACPI_TABLES
         object acpi_tables.o
        makerule dsdt.c
                depends "$(MAINBOARD)/dsdt.dsl"
-               action  "iasl -p $(PWD)/dsdt -tc $(MAINBOARD)/dsdt.dsl"
+               action  "iasl -p $(CURDIR)/dsdt -tc $(MAINBOARD)/dsdt.dsl"
                action  "mv dsdt.hex dsdt.c"
        end
         object ./dsdt.o

diff --git a/src/northbridge/amd/amdfam10/Config.lb b/src/northbridge/amd/amdfam10/Config.lb
index 79b7b4928051cd26f35900b4f12c40506f7b16e6..4f84115d77f7f35027d4928331e987182f945598 100644 (file)
--- a/src/northbridge/amd/amdfam10/Config.lb
+++ b/src/northbridge/amd/amdfam10/Config.lb
@@ -33,42 +33,42 @@ if HAVE_ACPI_TABLES
        object amdfam10_acpi.o
        makerule ssdt.c
                depends "$(TOP)/src/northbridge/amd/amdfam10/ssdt.dsl"
-               action   "iasl -p $(PWD)/ssdt -tc $(TOP)/src/northbridge/amd/amdfam10/ssdt.dsl"
+               action   "iasl -p $(CURDIR)/ssdt -tc $(TOP)/src/northbridge/amd/amdfam10/ssdt.dsl"
                action   "perl -pi -e 's/AmlCode/AmlCode_ssdt/g' ssdt.hex"
                action   "mv ssdt.hex ssdt.c"
        end
        object ./ssdt.o
        makerule sspr1.c
                depends "$(TOP)/src/northbridge/amd/amdfam10/sspr1.dsl"
-               action   "iasl -p $(PWD)/sspr1 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr1.dsl"
+               action   "iasl -p $(CURDIR)/sspr1 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr1.dsl"
                action   "perl -pi -e 's/AmlCode/AmlCode_sspr1/g' sspr1.hex"
                action   "mv sspr1.hex sspr1.c"
        end
        object ./sspr1.o
        makerule sspr2.c
                depends "$(TOP)/src/northbridge/amd/amdfam10/sspr2.dsl"
-               action   "iasl -p $(PWD)/sspr2 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr2.dsl"
+               action   "iasl -p $(CURDIR)/sspr2 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr2.dsl"
                action   "perl -pi -e 's/AmlCode/AmlCode_sspr2/g' sspr2.hex"
                action   "mv sspr2.hex sspr2.c"
        end
        object ./sspr2.o
        makerule sspr3.c
                depends "$(TOP)/src/northbridge/amd/amdfam10/sspr3.dsl"
-               action   "iasl -p $(PWD)/sspr3 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr3.dsl"
+               action   "iasl -p $(CURDIR)/sspr3 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr3.dsl"
                action   "perl -pi -e 's/AmlCode/AmlCode_sspr3/g' sspr3.hex"
                action   "mv sspr3.hex sspr3.c"
        end
        object ./sspr3.o
        makerule sspr4.c
                depends "$(TOP)/src/northbridge/amd/amdfam10/sspr4.dsl"
-               action   "iasl -p $(PWD)/sspr4 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr4.dsl"
+               action   "iasl -p $(CURDIR)/sspr4 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr4.dsl"
                action   "perl -pi -e 's/AmlCode/AmlCode_sspr4/g' sspr4.hex"
                action   "mv sspr4.hex sspr4.c"
        end
        object ./sspr4.o
        makerule sspr5.c
                depends "$(TOP)/src/northbridge/amd/amdfam10/sspr5.dsl"
-               action   "iasl -p $(PWD)/sspr5 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr5.dsl"
+               action   "iasl -p $(CURDIR)/sspr5 -tc $(TOP)/src/northbridge/amd/amdfam10/sspr5.dsl"
                action   "perl -pi -e 's/AmlCode/AmlCode_sspr5/g' sspr5.hex"
                action   "mv sspr5.hex sspr5.c"
        end

diff --git a/util/abuild/abuild b/util/abuild/abuild
index f8e8196232e880bb90d43fbdaf13c75806430624..5f6120faa8c62db95bb545fee7a213ae28f7b158 100755 (executable)
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -36,7 +36,14 @@ cpus=1
 configureonly=0
 
 # One might want to adjust these in case of cross compiling
-MAKE="make"
+for i in make gmake gnumake nonexistant_make; do
+       $i --version 2>/dev/null |grep "GNU Make" >/dev/null && break
+done
+if [ "$i" = "nonexistant_make" ]; then
+       echo No GNU Make found.
+       exit 1
+fi
+MAKE=$i
 PYTHON=python
 
 # this can be changed to xml by -x
@@ -202,10 +209,11 @@ EOF
                LOGLEVEL2=""
        fi
 
-       if [ "`which lzma`" != "" -a "$PAYLOAD" != /dev/null ]; then
-               COMPRESSION="option CONFIG_COMPRESSED_PAYLOAD_LZMA=1"
-       else
-               COMPRESSION="# no compression"
+       COMPRESSION="# no compression"
+       if which lzma >/dev/null 2>/dev/null; then
+               if [ "$PAYLOAD" != /dev/null ]; then
+                       COMPRESSION="option CONFIG_COMPRESSED_PAYLOAD_LZMA=1"
+               fi
        fi
 
        cp $TARGET/Config-${VENDOR}_${MAINBOARD}.lb $TARGET/Config-${VENDOR}_${MAINBOARD}.lb.pre
@@ -266,7 +274,7 @@ function create_builddir
                xmlfile $build_dir/config.log
                xml "  </log>"
                xml ""
-               tail -n $CONTEXT $build_dir/config.log
+               tail -n $CONTEXT $build_dir/config.log 2> /dev/null || tail -$CONTEXT $build_dir/config.log
                return 1
        fi
 }
@@ -315,7 +323,7 @@ function compile_target
                xml "  </log>"
 
                printf "FAILED after ${duration}s! Log excerpt:\n"
-               tail -n $CONTEXT make.log
+               tail -n $CONTEXT make.log 2> /dev/null || tail -$CONTEXT make.log
                cd $CURR
                return 1
        fi

diff --git a/util/newconfig/config.g b/util/newconfig/config.g
index f2b8df17a99490cbcce84e23e8d963e374a0bf7d..b8b8c16e9cd4bbb782611a0c8e66e1b338168f68 100644 (file)
--- a/util/newconfig/config.g
+++ b/util/newconfig/config.g
@@ -2118,7 +2118,7 @@ def writeimagemakefile(image):
        file.write("# Function to create an item like -Di586 or -DCONFIG_MAX_CPUS='1' or -Ui686\n")
        file.write("D_item = $(shell echo '$(if $(subst undefined,,$(origin $1)),\\#define $1$(if $($1), $($1),),\\#undef $1)' >> settings.h)\n\n")
        file.write("# Compute the value of CPUFLAGS here during make's first pass.\n")
-       file.write("CPUFLAGS := $(strip $(shell echo '/* autogenerated */' > settings.h)$(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))-include $(PWD)/settings.h)\n\n")
+       file.write("CPUFLAGS := $(strip $(shell echo '/* autogenerated */' > settings.h)$(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))-include $(CURDIR)/settings.h)\n\n")
 
        for i in image.getuserdefines():
                file.write("%s\n" %i)

diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c
index bc647fd75b83d6b0e8fdc3a98e3d232e5e7807b0..5ab94274afc1ebf944b770b8202a47fd87aa4cb8 100644 (file)
--- 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);
                        }