From 157851fdbb21ea34954c1ff1c57dbec5971bac93 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Fri, 29 May 2020 10:20:14 +0200 Subject: crossgcc: Upgrade IASL to version 20200528 Update fixes build issues with host GCC 10. Other changes: https://acpica.org/node/177 https://acpica.org/node/178 https://acpica.org/node/179 https://acpica.org/node/181 acpinames utility removed: "Removed support for the acpinames utility. The acpinames was a simple utility used to populate and display the ACPI namespace without executing any AML code. However, ACPICA now supports executable opcodes outside of control methods. This means that executable AML opcodes such as If and Store opcodes need to be executed during table load. Therefore, acpinames would need to be updated to match the same behavior as the acpiexec utility and since acpiexec can already dump the entire namespace (via the 'namespace' command), we no longer have the need to maintain acpinames." Change-Id: Ibd995561ca53458b04f87cee5693850c0d90d3d6 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/coreboot/+/38907 Reviewed-by: Patrick Georgi Reviewed-by: Paul Menzel Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- util/crossgcc/buildgcc | 8 +++---- .../patches/acpica-unix2-20200110_iasl.patch | 27 ---------------------- .../patches/acpica-unix2-20200528_iasl.patch | 27 ++++++++++++++++++++++ .../sum/acpica-unix2-20200110.tar.gz.cksum | 1 - .../sum/acpica-unix2-20200528.tar.gz.cksum | 1 + 5 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 util/crossgcc/patches/acpica-unix2-20200110_iasl.patch create mode 100644 util/crossgcc/patches/acpica-unix2-20200528_iasl.patch delete mode 100644 util/crossgcc/sum/acpica-unix2-20200110.tar.gz.cksum create mode 100644 util/crossgcc/sum/acpica-unix2-20200528.tar.gz.cksum diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 2e5b2d0756..17c89e82b2 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -40,7 +40,7 @@ GCC_VERSION=8.3.0 GCC_AUTOCONF_VERSION=2.69 BINUTILS_VERSION=2.33.1 GDB_VERSION=9.2 -IASL_VERSION=20200110 +IASL_VERSION=20200528 PYTHON_VERSION=3.8.1 EXPAT_VERSION=2.2.9 # CLANG version number @@ -843,9 +843,9 @@ build_IASL() { test "$UNAME" = "Cygwin" && HOST="_CYGWIN" HOST="$HOST" CFLAGS="$CFLAGS" \ OPT_CFLAGS="-O -D_FORTIFY_SOURCE=2 -D COREBOOT_TOOLCHAIN_VERSION='\"coreboot toolchain v$CROSSGCC_VERSION $CROSSGCC_DATE\"' " \ - $MAKE $JOBS CC="$(hostcc host)" iasl acpibin acpidump acpiexec acpihelp acpinames acpisrc acpixtract - rm -f "$DESTDIR$TARGETDIR/bin/{iasl,acpibin,acpidump,acpiexec,acpihelp,acpinames,acpisrc,acpixtract}" || touch "$RDIR/.failed" - cp bin/{iasl,acpibin,acpidump,acpiexec,acpihelp,acpinames,acpisrc,acpixtract} "$DESTDIR$TARGETDIR/bin" || touch "$RDIR/.failed" + $MAKE $JOBS CC="$(hostcc host)" iasl acpibin acpidump acpiexec acpihelp acpisrc acpixtract + rm -f "$DESTDIR$TARGETDIR/bin/{iasl,acpibin,acpidump,acpiexec,acpihelp,acpisrc,acpixtract}" || touch "$RDIR/.failed" + cp bin/{iasl,acpibin,acpidump,acpiexec,acpihelp,acpisrc,acpixtract} "$DESTDIR$TARGETDIR/bin" || touch "$RDIR/.failed" } build_LLVM() { diff --git a/util/crossgcc/patches/acpica-unix2-20200110_iasl.patch b/util/crossgcc/patches/acpica-unix2-20200110_iasl.patch deleted file mode 100644 index 0f6097450b..0000000000 --- a/util/crossgcc/patches/acpica-unix2-20200110_iasl.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur acpica-unix2-20190703_/source/compiler/asloptions.c acpica-unix2-20190703/source/compiler/asloptions.c > acpica-unix2-20190703_iasl.patch ---- acpica-unix2-20190703_/source/compiler/asloptions.c -+++ acpica-unix2-20190703/source/compiler/asloptions.c -@@ -126,6 +126,7 @@ - if (Gbl_DoSignon) - { - printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); -+ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); - if (AslGbl_IgnoreErrors) - { - printf ("Ignoring all errors, forcing AML file generation\n\n"); -@@ -753,6 +754,7 @@ - case '^': - - printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); -+ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); - exit (0); - - case 'a': -@@ -766,6 +768,7 @@ - - printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); - printf (ACPI_COMMON_BUILD_TIME); -+ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); - exit (0); - - case 'e': diff --git a/util/crossgcc/patches/acpica-unix2-20200528_iasl.patch b/util/crossgcc/patches/acpica-unix2-20200528_iasl.patch new file mode 100644 index 0000000000..3fac35d9d3 --- /dev/null +++ b/util/crossgcc/patches/acpica-unix2-20200528_iasl.patch @@ -0,0 +1,27 @@ +diff -Naur acpica-unix2-20200528_/source/compiler/asloptions.c acpica-unix2-20200528/source/compiler/asloptions.c > acpica-unix2-20200528_iasl.patch +--- acpica-unix2-20200528_/source/compiler/asloptions.c ++++ acpica-unix2-20200528/source/compiler/asloptions.c +@@ -126,6 +126,7 @@ + if (Gbl_DoSignon) + { + printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); ++ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); + if (AslGbl_IgnoreErrors) + { + printf ("Ignoring all errors, forcing AML file generation\n\n"); +@@ -753,6 +754,7 @@ + case '^': + + printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); ++ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); + exit (0); + + case 'a': +@@ -766,6 +768,7 @@ + + printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); + printf (ACPI_COMMON_BUILD_TIME); ++ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); + exit (0); + + case 'e': diff --git a/util/crossgcc/sum/acpica-unix2-20200110.tar.gz.cksum b/util/crossgcc/sum/acpica-unix2-20200110.tar.gz.cksum deleted file mode 100644 index 48c0a2f7b7..0000000000 --- a/util/crossgcc/sum/acpica-unix2-20200110.tar.gz.cksum +++ /dev/null @@ -1 +0,0 @@ -50c163d965aa2cbee9a3a5d9244d1a0d16c06ec0 tarballs/acpica-unix2-20200110.tar.gz diff --git a/util/crossgcc/sum/acpica-unix2-20200528.tar.gz.cksum b/util/crossgcc/sum/acpica-unix2-20200528.tar.gz.cksum new file mode 100644 index 0000000000..d2265e1869 --- /dev/null +++ b/util/crossgcc/sum/acpica-unix2-20200528.tar.gz.cksum @@ -0,0 +1 @@ +27afd4c05c966e9390fcc30bdf1f53ddb7d69033 tarballs/acpica-unix2-20200528.tar.gz -- cgit v1.2.3