8c2ae8
diff -Naur acpica-unix2-20180209.orig/source/components/tables/tbutils.c acpica-unix2-20180209/source/components/tables/tbutils.c
8c2ae8
--- acpica-unix2-20180209.orig/source/components/tables/tbutils.c	2018-03-15 16:47:21.831526264 -0600
8c2ae8
+++ acpica-unix2-20180209/source/components/tables/tbutils.c	2018-03-15 16:58:20.030097284 -0600
8c2ae8
@@ -238,9 +238,11 @@
8c2ae8
          * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
8c2ae8
          *  return 64-bit
8c2ae8
          */
8c2ae8
-	Address64 = (UINT64) TableEntry;
8c2ae8
 
8c2ae8
 #if ACPI_MACHINE_WIDTH == 32
8c2ae8
+	UINT32 Tmp32 = (UINT32) TableEntry;
8c2ae8
+
8c2ae8
+	Address64 = (UINT64) Tmp32;
8c2ae8
         if (Address64 > ACPI_UINT32_MAX)
8c2ae8
         {
8c2ae8
             /* Will truncate 64-bit address to 32 bits, issue warning */
8c2ae8
@@ -250,9 +252,15 @@
8c2ae8
                 " truncating",
8c2ae8
                 ACPI_FORMAT_UINT64 (Address64)));
8c2ae8
         }
8c2ae8
-#endif
8c2ae8
+
8c2ae8
+        return ((ACPI_PHYSICAL_ADDRESS) (*ACPI_CAST_PTR (
8c2ae8
+            UINT32, TableEntry)));
8c2ae8
+#else
8c2ae8
+	Address64 = (UINT64) TableEntry;
8c2ae8
+
8c2ae8
         return ((ACPI_PHYSICAL_ADDRESS) (*ACPI_CAST_PTR (
8c2ae8
             UINT64, Address64)));
8c2ae8
+#endif
8c2ae8
     }
8c2ae8
 }
8c2ae8
 
8c2ae8
diff -Naur acpica-unix2-20180209.orig/source/compiler/aslparseop.c acpica-unix2-20180209/source/compiler/aslparseop.c
8c2ae8
--- acpica-unix2-20180209.orig/source/compiler/aslparseop.c	2018-03-15 17:20:09.844338074 -0600
8c2ae8
+++ acpica-unix2-20180209/source/compiler/aslparseop.c	2018-03-15 17:28:19.570800797 -0600
8c2ae8
@@ -287,7 +287,11 @@
8c2ae8
         ParseOpcode == PARSEOP_NAMESEG ||
8c2ae8
         ParseOpcode == PARSEOP_STRING_LITERAL)
8c2ae8
     {
8c2ae8
+#if ACPI_MACHINE_WIDTH == 32
8c2ae8
+        Op->Asl.Value.String = (char *) (UINT32) Value;
8c2ae8
+#else
8c2ae8
         Op->Asl.Value.String = (char *) Value;
8c2ae8
+#endif
8c2ae8
     }
8c2ae8
     else
8c2ae8
     {