[Xen-changelog] [xen stable-4.9] libacpi: fixes for iasl >= 20180427

[patchbot@xxxxxxx]

commit b3277ca63803dd473419d2daa551d43ff66b3140
Author:     Roger Pau Monné <roger.pau@xxxxxxxxxx>
AuthorDate: Fri May 18 12:00:52 2018 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri May 18 12:00:52 2018 +0200

    libacpi: fixes for iasl >= 20180427
    
    New versions of iasl have introduced improved C file generation, as
    reported in the changelog:
    
    iASL: Enhanced the -tc option (which creates an AML hex file in C,
    suitable for import into a firmware project):
      1) Create a unique name for the table, to simplify use of multiple
    SSDTs.
      2) Add a protection #ifdef in the file, similar to a .h header file.
    
    The net effect of that on generated files is:
    
    -unsigned char AmlCode[] =
    +#ifndef __SSDT_S4_HEX__
    +#define __SSDT_S4_HEX__
    +
    +unsigned char ssdt_s4_aml_code[] =
    
    The above example is from ssdt_s4.asl.
    
    Fix the build with newer versions of iasl by stripping the '_aml_code'
    suffix from the variable name on generated files.
    
    Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Reviewed-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    master commit: 858dbaaeda33b05c1ac80aea0ba9a03924e09005
    master date: 2018-05-09 18:17:51 +0100
---
 tools/libacpi/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile
index fd7af1bc2b..328171e596 100644
--- a/tools/libacpi/Makefile
+++ b/tools/libacpi/Makefile
@@ -43,7 +43,7 @@ all: $(C_SRC) $(H_SRC)
 
 $(H_SRC): $(ACPI_BUILD_DIR)/%.h: %.asl iasl
        iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $<
-       sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex >$@
+       sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex >$@
        rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)
  
 $(MK_DSDT): mk_dsdt.c
@@ -76,7 +76,7 @@ $(ACPI_BUILD_DIR)/dsdt_anycpu_arm.asl: $(MK_DSDT)
 
 $(C_SRC): $(ACPI_BUILD_DIR)/%.c: iasl $(ACPI_BUILD_DIR)/%.asl
        iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc 
$(ACPI_BUILD_DIR)/$*.asl
-       sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX)
+       sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex > 
$@.$(TMP_SUFFIX)
        echo "int $*_len=sizeof($*);" >> $@.$(TMP_SUFFIX)
        mv -f $@.$(TMP_SUFFIX) $@
        rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.9

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog