From: Michael S. Tsirkin <mst@redhat.com>
Date: Thu, 2 Aug 2012 18:57:20 +0000 (+0300)
Subject: acpi: fix build with new iasl compiler
X-Git-Tag: rel-1.7.1~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4da0725dc39d2e64d8efa593210599004833269b;p=seabios.git

acpi: fix build with new iasl compiler

iasl versions starting with 20120320
(git commit 7fd09d993580e22a096a1b21d2a356d89e702153) enable
a preprocessor by default, which currently strips out
comments from the input. Happily the next release,
20120420, includes an option to disable the preprocessor.
Test and use this option when available.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/Makefile b/Makefile
index dfdec5c..849824d 100644
--- a/Makefile
+++ b/Makefile
@@ -221,11 +221,14 @@ $(OUT)vgabios.bin: $(OUT)vgabios.bin.raw tools/buildrom.py
 
 ################ DSDT build rules
 
+iasl-option=$(shell if "$(1)" "$(2)" -h > /dev/null 2>&1 \
+    ; then echo "$(2)"; else echo "$(3)"; fi ;)
+
 $(OUT)%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.py
 	@echo "  Compiling IASL $@"
 	$(Q)cpp -P $< > $(OUT)$*.dsl.i.orig
 	$(Q)$(PYTHON) ./tools/acpi_extract_preprocess.py $(OUT)$*.dsl.i.orig > $(OUT)$*.dsl.i
-	$(Q)$(IASL) -vs -l -tc -p $(OUT)$* $(OUT)$*.dsl.i
+	$(Q)$(IASL) $(call iasl-option,$(IASL),-Pn,) -vs -l -tc -p $(OUT)$* $(OUT)$*.dsl.i
 	$(Q)$(PYTHON) ./tools/acpi_extract.py $(OUT)$*.lst > $(OUT)$*.off
 	$(Q)cat $(OUT)$*.off > $@