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