Import ACPICA 20100528.

1 files changed, 15 insertions, 1 deletions

diff --git a/compiler/aslmain.c b/compiler/aslmain.c
index 42127c0..406f67b 100644
--- a/compiler/aslmain.c
+++ b/compiler/aslmain.c
@@ -167,7 +167,7 @@ AslDoResponseFile (
 
 
 #define ASL_TOKEN_SEPARATORS    " \t\n"
-#define ASL_SUPPORTED_OPTIONS   "@:2b:c:d^e:fgh^i^I:l^no:p:r:s:t:v:w:x:"
+#define ASL_SUPPORTED_OPTIONS   "@:2b:c:d^e:fgh^i^I:l^no:p:r:s:t:v:w:x:yz"
 
 
 /*******************************************************************************
@@ -268,6 +268,8 @@ HelpMessage (
     printf ("  -n             Parse only, no output generation\n");
     printf ("  -ot            Display compile times\n");
     printf ("  -x<level>      Set debug level for trace output\n");
+    printf ("  -y             Temporary: Enable data table compiler\n");
+    printf ("  -z             Do not insert new compiler ID for DataTables\n");
 }
 
 
@@ -831,6 +833,18 @@ AslDoOptions (
         break;
 
 
+    case 'y':
+
+        Gbl_DataTableCompilerAvailable = TRUE;
+        break;
+
+
+    case 'z':
+
+        Gbl_UseOriginalCompilerId = TRUE;
+        break;
+
+
     default:
 
         return (-1);