Merge ACPICA 20091214.

1 files changed, 21 insertions, 14 deletions

diff --git a/sys/contrib/dev/acpica/compiler/aslcompile.c b/sys/contrib/dev/acpica/compiler/aslcompile.c
index 800d307..b8e9b2e 100644
--- a/sys/contrib/dev/acpica/compiler/aslcompile.c
+++ b/sys/contrib/dev/acpica/compiler/aslcompile.c
@@ -895,20 +895,6 @@ CmCleanupAndExit (
                         10) / Gbl_NsLookupCount);
     }
 
-    /*
-     * TBD: SourceOutput should be .TMP, then rename if we want to keep it?
-     */
-    if (!Gbl_SourceOutputFlag)
-    {
-        remove (Gbl_Files[ASL_FILE_SOURCE_OUTPUT].Filename);
-    }
-
-    /* Delete AML file if there are errors */
-
-    if ((Gbl_ExceptionCount[ASL_ERROR] > 0) && (!Gbl_IgnoreErrors))
-    {
-        remove (Gbl_Files[ASL_FILE_AML_OUTPUT].Filename);
-    }
 
     if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
     {
@@ -923,6 +909,27 @@ CmCleanupAndExit (
     {
         FlCloseFile (i);
     }
+
+    /* Delete AML file if there are errors */
+
+    if ((Gbl_ExceptionCount[ASL_ERROR] > 0) && (!Gbl_IgnoreErrors))
+    {
+        remove (Gbl_Files[ASL_FILE_AML_OUTPUT].Filename);
+    }
+
+    /*
+     * Delete intermediate ("combined") source file (if -ls flag not set)
+     *
+     * TBD: SourceOutput should be .TMP, then rename if we want to keep it?
+     */
+    if (!Gbl_SourceOutputFlag)
+    {
+        if (remove (Gbl_Files[ASL_FILE_SOURCE_OUTPUT].Filename))
+        {
+            printf ("Could not remove SRC file, %s\n",
+                Gbl_Files[ASL_FILE_SOURCE_OUTPUT].Filename);
+        }
+    }
 }