Import ACPICA 20130626.vendor/acpica/20130626

4 files changed, 41 insertions, 25 deletions

diff --git a/generate/unix/Makefile.common b/generate/unix/Makefile.common
index a0e26bab2cac..21f8786cbb91 100644
--- a/generate/unix/Makefile.common
+++ b/generate/unix/Makefile.common
@@ -12,11 +12,11 @@ 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
+all:	$(PROGS)
+$(PROGS): FORCE
 	@cd $(BUILD_DIRECTORY_PATH)/$@; \
 	mkdir -p obj; \
-	make || exit "$$?"; \
+	$(MAKE) || exit "$$?"; \
 	if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
 		echo "64-bit version of $@:"; \
 	else \
@@ -30,12 +30,12 @@ ${PROGS}: FORCE
 # in the local bin directory
 #
 clean:	FORCE
-	@for toolname in ${PROGS}; do \
+	@for toolname in $(PROGS); do \
 		(cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
 		if [ -d "obj" ] ; then \
 			echo "Removing $$toolname:"; \
 			pwd; \
-			make clean; \
+			$(MAKE) clean; \
 			rmdir obj; \
 			echo ""; \
 		fi; \
@@ -46,12 +46,12 @@ clean:	FORCE
 # Very clean removes all executables and the local bin directory
 #
 veryclean:	FORCE
-	@for toolname in ${PROGS}; do \
+	@for toolname in $(PROGS); do \
 		(cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
 		if [ -d "obj" ] ; then \
 			echo "Removing $$toolname:"; \
 			pwd; \
-			make clean; \
+			$(MAKE) clean; \
 			rmdir obj; \
 			echo ""; \
 		fi; \
@@ -68,10 +68,10 @@ veryclean:	FORCE
 # Install all tools, either 32-bit or 64-bit as appropriate for the host OS
 #
 install:	FORCE
-	@for toolname in ${PROGS}; do \
+	@for toolname in $(PROGS); do \
 		(cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
 		pwd; \
-		make PROG=$$toolname install; \
+		$(MAKE) PROG=$$toolname install; \
 		if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
 			echo "Installed 64-bit version of $$toolname"; \
 		else \
diff --git a/generate/unix/Makefile.config b/generate/unix/Makefile.config
index 390a4643d6a2..3e4ecd2b9de0 100644
--- a/generate/unix/Makefile.config
+++ b/generate/unix/Makefile.config
@@ -26,7 +26,7 @@
 # Notes:
 #   gcc should be version 4 or greater, otherwise some of the options
 #     used will not be recognized.
-#   Optional: Change HOST to an appropriate value (_LINUX, __FreeBSD__, etc.)
+#   Optional: Set HOST to an appropriate value (_LINUX, _FreeBSD, _APPLE, _CYGWIN, etc.)
 #     See include/platform/acenv.h for supported values.
 #     Note: HOST is not nearly as important for applications as it
 #     is for the kernel-resident version of ACPICA, and it may
@@ -155,22 +155,27 @@ CWARNINGFLAGS += \
     -Waddress\
     -Waggregate-return\
     -Wchar-subscripts\
-    -Wempty-body\
     -Wmissing-declarations\
     -Wmissing-field-initializers\
     -Wnested-externs\
     -Wold-style-definition\
+    -Wno-format-nonliteral\
     -Wredundant-decls
 
 #
-# Additional gcc 4+ flags
+# Per-host flags and exclusions
 #
-ifneq ($(HOST), _APPLE)
-CWARNINGFLAGS += \
-    -Wlogical-op\
-    -Wmissing-parameter-type\
-    -Wold-style-declaration\
-    -Wtype-limits
+ifneq ($(HOST), _FreeBSD)
+    CWARNINGFLAGS += \
+        -Wempty-body
+
+    ifneq ($(HOST), _APPLE)
+        CWARNINGFLAGS += \
+        -Wlogical-op\
+        -Wmissing-parameter-type\
+        -Wold-style-declaration\
+        -Wtype-limits
+    endif
 endif
 
 #
diff --git a/generate/unix/acpidump/Makefile b/generate/unix/acpidump/Makefile
index 637ef33cee99..9865b2ca25b1 100644
--- a/generate/unix/acpidump/Makefile
+++ b/generate/unix/acpidump/Makefile
@@ -32,15 +32,26 @@ OBJECTS = \
 	$(OBJDIR)/apfiles.o\
 	$(OBJDIR)/apmain.o\
 	$(OBJDIR)/tbprint.o\
+	$(OBJDIR)/tbxfroot.o\
 	$(OBJDIR)/utbuffer.o\
 	$(OBJDIR)/utexcep.o\
 	$(OBJDIR)/utmath.o\
 	$(OBJDIR)/utstring.o\
 	$(OBJDIR)/utxferror.o\
-	$(OBJDIR)/oslinuxtbl.o\
 	$(OBJDIR)/getopt.o
 
 #
+# Per-host interfaces
+#
+ifeq ($(HOST), _FreeBSD)
+OBJECTS += \
+	$(OBJDIR)/osfreebsdtbl.o
+else
+OBJECTS += \
+	$(OBJDIR)/oslinuxtbl.o
+endif
+
+#
 # Flags specific to acpidump
 #
 CFLAGS += \
diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile
index 931620a74170..e9520edf4e31 100644
--- a/generate/unix/iasl/Makefile
+++ b/generate/unix/iasl/Makefile
@@ -238,22 +238,22 @@ include ../Makefile.rules
 # Parser and Lexer - intermediate C files
 #
 $(OBJDIR)/aslcompilerlex.c :   $(ASL_COMPILER)/aslcompiler.l $(ASL_COMPILER)/aslsupport.l
-	${LEX} ${LFLAGS} -PAslCompiler -o$@ $(ASL_COMPILER)/aslcompiler.l
+	$(LEX) $(LFLAGS) -PAslCompiler -o$@ $(ASL_COMPILER)/aslcompiler.l
 
 $(OBJDIR)/aslcompilerparse.c $(OBJDIR)/aslcompilerparse.h : $(ASL_COMPILER)/aslcompiler.y
-	${YACC} ${YFLAGS} -pAslCompiler -o$@ $?
+	$(YACC) $(YFLAGS) -pAslCompiler -o$@ $?
 
 $(OBJDIR)/dtparserlex.c :      $(ASL_COMPILER)/dtparser.l
-	${LEX} ${LFLAGS} -PDtParser -o$@ $?
+	$(LEX) $(LFLAGS) -PDtParser -o$@ $?
 
 $(OBJDIR)/dtparserparse.c $(OBJDIR)/dtparserparse.h : $(ASL_COMPILER)/dtparser.y
-	${YACC} ${YFLAGS} -pDtParser -o$@ $?
+	$(YACC) $(YFLAGS) -pDtParser -o$@ $?
 
 $(OBJDIR)/prparserlex.c :      $(ASL_COMPILER)/prparser.l
-	${LEX} ${LFLAGS} -PPrParser -o$@ $?
+	$(LEX) $(LFLAGS) -PPrParser -o$@ $?
 
 $(OBJDIR)/prparserparse.c $(OBJDIR)/prparserparse.h : $(ASL_COMPILER)/prparser.y
-	${YACC} ${YFLAGS} -pPrParser -o$@ $?
+	$(YACC) $(YFLAGS) -pPrParser -o$@ $?
 
 
 #