Import ACPICA 20120711.vendor/acpica/20120711

8 files changed, 119 insertions, 104 deletions

diff --git a/generate/release/build.sh b/generate/release/build.sh
index e405a307b708..ab87792709fa 100755
--- a/generate/release/build.sh
+++ b/generate/release/build.sh
@@ -254,6 +254,7 @@ generate_source_package ()
 	#
 	# Copy generic UNIX makefiles
 	#
+    cp Makefile                             $TEMP_DIR
 	cp generate/unix/readme.txt             $TEMP_DIR/generate/unix/readme.txt
 	cp generate/unix/Makefile*              $TEMP_DIR/generate/unix
 	cp generate/unix/acpibin/Makefile       $TEMP_DIR/generate/unix/acpibin
diff --git a/generate/unix/Makefile b/generate/unix/Makefile
index 071b17da1959..5b187d7d0ac8 100644
--- a/generate/unix/Makefile
+++ b/generate/unix/Makefile
@@ -4,107 +4,13 @@
 
 #
 # Note: This makefile is intended to be used from within the native
-# ACPICA directory structure, from under generate/unix. It specifically
-# places all object files in a generate/unix subdirectory, not within
-# the various ACPICA source directories. This prevents collisions
-# between different compilations of the same source file with different
-# compile options, and prevents pollution of the source code.
+# ACPICA directory structure, from under the generate/unix directory.
+# It specifically places all the object files for each tool in separate
+# generate/unix subdirectories, not within the various ACPICA source
+# code directories. This prevents collisions between different
+# compilations of the same source file with different compile options.
 #
-include Makefile.config
-
-#
-# Get the OS machine architecture. Anything with a "64" in the returned
-# string will be treated as a 64-bit OS. Otherwise, the default is 32-bit.
-#
-HARDWARE_NAME := $(shell uname -m)
-
-#
-# Main rule will only generate versions that are appropriate for the running
-# OS, either 64-bit or 32-bit.
-#
-all:	${PROGS}
-${PROGS}: FORCE
-	@cd $@; \
-	if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
-		mkdir -p obj64; \
-		make BITS=64; \
-		echo "64-bit version of $@:"; \
-		ls -al obj64/$@; \
-	else \
-		mkdir -p obj32; \
-		make BITS=32; \
-		echo "32-bit version of $@:"; \
-		ls -al obj32/$@; \
-	fi;
-
-#
-# Make 32-bit and 64-bit versions of all the tools
-#
-both:	32 64
-
-#
-# Make only 32-bit versions of all the tools
-#
-32:	FORCE
-	@for toolname in ${PROGS}; do \
-		(cd $$toolname; \
-		pwd; \
-		mkdir -p obj32; \
-		make BITS=32; \
-		echo "32-bit version of $$toolname:"; \
-		ls -al obj32/$$toolname \
-		); \
-	done;
-
-#
-# Make only 64-bit versions of all the tools
-#
-64:	FORCE
-	@for toolname in ${PROGS}; do \
-		(cd $$toolname; \
-		pwd; \
-		mkdir -p obj64; \
-		make BITS=64; \
-		echo "64-bit version of $$toolname:"; \
-		ls -al obj64/$$toolname \
-		); \
-	done;
-
-clean:	FORCE
-	@for toolname in ${PROGS}; do \
-		(cd $$toolname; \
-		pwd; \
-		if [ -d "obj32" ] ; then \
-			make BITS=32 clean; \
-			rmdir obj32; \
-		fi; \
-		if [ -d "obj64" ] ; then \
-			make BITS=64 clean; \
-			rmdir obj64; \
-		fi; \
-		); \
-	done;
-
-#
-# Install all tools, either 32-bit or 64-bit as appropriate for the host OS
-#
-install:	FORCE
-	@for toolname in ${PROGS}; do \
-		(cd $$toolname; \
-		pwd; \
-		if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
-			make BITS=64 install; \
-			echo "Installed 64-bit version of $$toolname"; \
-		else \
-			make BITS=32 install; \
-			echo "Installed 32-bit version of $$toolname"; \
-		fi; \
-		); \
-	done;
-
-machine:	FORCE
-	@echo "Machine architecture: $(HARDWARE_NAME), $(XBITS)";
-	@echo "Findstring: $(findstring 64, $(HARDWARE_NAME))";
-
-FORCE:
+BUILD_DIRECTORY_PATH = "."
 
+include Makefile.config
+include Makefile.common
diff --git a/generate/unix/Makefile.common b/generate/unix/Makefile.common
new file mode 100644
index 000000000000..2d7ac70511ac
--- /dev/null
+++ b/generate/unix/Makefile.common
@@ -0,0 +1,100 @@
+#
+# Common make for acpica tools and utilities
+#
+
+#
+# Get the OS machine architecture. Anything with a "64" in the returned
+# string will be treated as a 64-bit OS. Otherwise, the default is 32-bit.
+#
+HARDWARE_NAME := $(shell uname -m)
+
+#
+# Main rule will only generate versions that are appropriate for the running
+# OS, either 64-bit or 32-bit.
+#
+all:	${PROGS}
+${PROGS}: FORCE
+	@cd $(BUILD_DIRECTORY_PATH)/$@; \
+	if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
+		mkdir -p obj64; \
+		make BITS=64; \
+		echo "64-bit version of $@:"; \
+		ls -al obj64/$@; \
+	else \
+		mkdir -p obj32; \
+		make BITS=32; \
+		echo "32-bit version of $@:"; \
+		ls -al obj32/$@; \
+	fi;
+
+#
+# Make 32-bit and 64-bit versions of all the tools
+#
+both:	32 64
+
+#
+# Make only 32-bit versions of all the tools
+#
+32:	FORCE
+	@for toolname in ${PROGS}; do \
+		(cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
+		pwd; \
+		mkdir -p obj32; \
+		make BITS=32; \
+		echo "32-bit version of $$toolname:"; \
+		ls -al obj32/$$toolname \
+		); \
+	done;
+
+#
+# Make only 64-bit versions of all the tools
+#
+64:	FORCE
+	@for toolname in ${PROGS}; do \
+		(cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
+		pwd; \
+		mkdir -p obj64; \
+		make BITS=64; \
+		echo "64-bit version of $$toolname:"; \
+		ls -al obj64/$$toolname \
+		); \
+	done;
+
+clean:	FORCE
+	@for toolname in ${PROGS}; do \
+		(cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
+		pwd; \
+		if [ -d "obj32" ] ; then \
+			make BITS=32 clean; \
+			rmdir obj32; \
+		fi; \
+		if [ -d "obj64" ] ; then \
+			make BITS=64 clean; \
+			rmdir obj64; \
+		fi; \
+		); \
+	done;
+
+#
+# Install all tools, either 32-bit or 64-bit as appropriate for the host OS
+#
+install:	FORCE
+	@for toolname in ${PROGS}; do \
+		(cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
+		pwd; \
+		if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
+			make BITS=64 install; \
+			echo "Installed 64-bit version of $$toolname"; \
+		else \
+			make BITS=32 install; \
+			echo "Installed 32-bit version of $$toolname"; \
+		fi; \
+		); \
+	done;
+
+machine:	FORCE
+	@echo "Machine architecture: $(HARDWARE_NAME), $(XBITS)";
+	@echo "Findstring: $(findstring 64, $(HARDWARE_NAME))";
+
+FORCE:
+
diff --git a/generate/unix/acpibin/Makefile b/generate/unix/acpibin/Makefile
index d1113c1aa55d..e26f209d7c88 100644
--- a/generate/unix/acpibin/Makefile
+++ b/generate/unix/acpibin/Makefile
@@ -32,6 +32,7 @@ OBJECTS = \
 	$(OBJDIR)/utcache.o \
 	$(OBJDIR)/utdebug.o \
 	$(OBJDIR)/utdecode.o \
+	$(OBJDIR)/utexcep.o \
 	$(OBJDIR)/utglobal.o \
 	$(OBJDIR)/utlock.o \
 	$(OBJDIR)/utmath.o \
diff --git a/generate/unix/acpiexec/Makefile b/generate/unix/acpiexec/Makefile
index f8e844e3c661..80ef514d7b3b 100644
--- a/generate/unix/acpiexec/Makefile
+++ b/generate/unix/acpiexec/Makefile
@@ -172,6 +172,7 @@ OBJECTS = \
 	$(OBJDIR)/tbinstal.o \
 	$(OBJDIR)/tbutils.o \
 	$(OBJDIR)/tbxface.o \
+	$(OBJDIR)/tbxfload.o \
 	$(OBJDIR)/tbxfroot.o \
 	$(OBJDIR)/utaddress.o \
 	$(OBJDIR)/utalloc.o \
@@ -181,6 +182,7 @@ OBJECTS = \
 	$(OBJDIR)/utdecode.o \
 	$(OBJDIR)/utdelete.o \
 	$(OBJDIR)/uteval.o \
+	$(OBJDIR)/utexcep.o \
 	$(OBJDIR)/utglobal.o \
 	$(OBJDIR)/utids.o \
 	$(OBJDIR)/utinit.o \
diff --git a/generate/unix/acpihelp/Makefile b/generate/unix/acpihelp/Makefile
index aee76ed17aea..30a690c9d1e9 100644
--- a/generate/unix/acpihelp/Makefile
+++ b/generate/unix/acpihelp/Makefile
@@ -19,7 +19,8 @@ PROG = $(OBJDIR)/acpihelp
 #
 vpath %.c \
     $(ACPIHELP) \
-    $(ACPICA_COMMON)
+    $(ACPICA_COMMON) \
+    $(ACPICA_UTILITIES)
 
 HEADERS = \
     $(wildcard $(ACPIHELP)/*.h)
@@ -31,7 +32,8 @@ OBJECTS = \
 	$(OBJDIR)/ahdecode.o \
 	$(OBJDIR)/ahpredef.o \
 	$(OBJDIR)/ahmain.o \
-	$(OBJDIR)/getopt.o
+	$(OBJDIR)/getopt.o \
+	$(OBJDIR)/utexcep.o
 
 #
 # Flags specific to acpihelp
diff --git a/generate/unix/acpinames/Makefile b/generate/unix/acpinames/Makefile
index 84b5a150a38a..ed3304dbfa66 100644
--- a/generate/unix/acpinames/Makefile
+++ b/generate/unix/acpinames/Makefile
@@ -81,6 +81,7 @@ OBJECTS = \
 	$(OBJDIR)/tbinstal.o \
 	$(OBJDIR)/tbutils.o \
 	$(OBJDIR)/tbxface.o \
+	$(OBJDIR)/tbxfload.o \
 	$(OBJDIR)/tbxfroot.o \
 	$(OBJDIR)/utaddress.o \
 	$(OBJDIR)/utalloc.o \
@@ -88,6 +89,7 @@ OBJECTS = \
 	$(OBJDIR)/utdebug.o \
 	$(OBJDIR)/utdecode.o \
 	$(OBJDIR)/utdelete.o \
+	$(OBJDIR)/utexcep.o \
 	$(OBJDIR)/utglobal.o \
 	$(OBJDIR)/utlock.o \
 	$(OBJDIR)/utmath.o \
diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile
index 53ba00141a95..0a09aa0db9d8 100644
--- a/generate/unix/iasl/Makefile
+++ b/generate/unix/iasl/Makefile
@@ -169,6 +169,7 @@ OBJECTS = \
 	$(OBJDIR)/utdebug.o \
 	$(OBJDIR)/utdecode.o \
 	$(OBJDIR)/utdelete.o \
+	$(OBJDIR)/utexcep.o \
 	$(OBJDIR)/utglobal.o \
 	$(OBJDIR)/utinit.o \
 	$(OBJDIR)/utlock.o \