Import ACPICA 20120816.vendor/acpica/20120816

10 files changed, 91 insertions, 116 deletions

diff --git a/generate/unix/Makefile.common b/generate/unix/Makefile.common
index 2d7ac70511ac..69e9806e9a5f 100644
--- a/generate/unix/Makefile.common
+++ b/generate/unix/Makefile.common
@@ -7,6 +7,7 @@
 # string will be treated as a 64-bit OS. Otherwise, the default is 32-bit.
 #
 HARDWARE_NAME := $(shell uname -m)
+BITS=0
 
 #
 # Main rule will only generate versions that are appropriate for the running
@@ -15,16 +16,22 @@ HARDWARE_NAME := $(shell uname -m)
 all:	${PROGS}
 ${PROGS}: FORCE
 	@cd $(BUILD_DIRECTORY_PATH)/$@; \
-	if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
+	if [ $(BITS) -eq 32 ]; then \
+		echo "Forced 32-bit generation of $@"; \
+		mkdir -p obj32; \
+		make BITS=32; \
+		echo "32-bit version of $@:"; \
+		ls -al ../bin32/$@; \
+	elif [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
 		mkdir -p obj64; \
 		make BITS=64; \
 		echo "64-bit version of $@:"; \
-		ls -al obj64/$@; \
+		ls -al ../bin64/$@; \
 	else \
 		mkdir -p obj32; \
 		make BITS=32; \
 		echo "32-bit version of $@:"; \
-		ls -al obj32/$@; \
+		ls -al ../bin32/$@; \
 	fi;
 
 #
@@ -63,6 +70,7 @@ both:	32 64
 clean:	FORCE
 	@for toolname in ${PROGS}; do \
 		(cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
+		echo "Removing $$toolname"; \
 		pwd; \
 		if [ -d "obj32" ] ; then \
 			make BITS=32 clean; \
@@ -72,6 +80,7 @@ clean:	FORCE
 			make BITS=64 clean; \
 			rmdir obj64; \
 		fi; \
+		echo ""; \
 		); \
 	done;
 
@@ -83,12 +92,13 @@ install:	FORCE
 		(cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
 		pwd; \
 		if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
-			make BITS=64 install; \
+			make BITS=64 PROG=$$toolname install; \
 			echo "Installed 64-bit version of $$toolname"; \
 		else \
-			make BITS=32 install; \
+			make BITS=32 PROG=$$toolname install; \
 			echo "Installed 32-bit version of $$toolname"; \
 		fi; \
+		echo ""; \
 		); \
 	done;
 
diff --git a/generate/unix/Makefile.config b/generate/unix/Makefile.config
index 3cd224e3a50f..4bcaed3b9b28 100644
--- a/generate/unix/Makefile.config
+++ b/generate/unix/Makefile.config
@@ -28,22 +28,30 @@
 #   The _GNU_SOURCE symbol is required for many hosts.
 #
 .SUFFIXES :
-PROGS =         acpibin acpiexec acpihelp acpinames acpisrc acpixtract iasl
-HOST =          _CYGWIN
-CC =            gcc
+PROGS = acpibin acpiexec acpihelp acpinames acpisrc acpixtract iasl
+HOST =  _CYGWIN
+CC =    gcc
 
 #
 # Common defines
 #
-OBJDIR =	obj$(BITS)
-BINDIR = 	bin$(BITS)
-BITSFLAG =	-m$(BITS)
-COMPILE =       $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $<
-COPYPROG =      @mkdir -p ../$(BINDIR); \
-		rm -f ../$(BINDIR)/$(PROG); \
-		cp --remove-destination $(PROG) ../$(BINDIR);
-INSTALLDIR =    /usr/bin
-INSTALLPROG =   cp --remove-destination $(PROG) $(INSTALLDIR)
+OBJDIR =     obj$(BITS)
+BINDIR =     bin$(BITS)
+BITSFLAG =   -m$(BITS)
+COMPILEOBJ = $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $<
+LINKPROG =   $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS)
+
+COPYPROG = \
+	@mkdir -p ../$(BINDIR); \
+	if [ -e "$(PROG).exe" ] ; then \
+		mv $(PROG).exe $(PROG); \
+		echo "Renamed $(PROG).exe to $(PROG)"; \
+	fi; \
+	cp --remove-destination $(PROG) ../$(BINDIR); \
+	echo "Copied $(PROG) to ../$(BINDIR)";
+
+INSTALLDIR = /usr/bin
+INSTALLPROG = install -D ../$(BINDIR)/$(PROG) $(DESTDIR)$(INSTALLDIR)/$(PROG)
 
 #
 # Main ACPICA source directories
@@ -92,6 +100,7 @@ CFLAGS += \
     $(BITSFLAG) \
     -D$(HOST) \
     -D_GNU_SOURCE \
+    -D_FORTIFY_SOURCE=2 \
     -I$(ACPICA_INCLUDE)
 
 LDFLAGS += $(BITSFLAG)
diff --git a/generate/unix/Makefile.rules b/generate/unix/Makefile.rules
new file mode 100644
index 000000000000..184630cd5384
--- /dev/null
+++ b/generate/unix/Makefile.rules
@@ -0,0 +1,23 @@
+#
+# Common rules for generation of ACPICA utilities
+#
+# FINAL_PROG - Copies the utility to the local binXX directory (32/64)
+# PROG - Builds the utility (links the object files)
+#
+# Note: $(INTERMEDIATES) and $(MISC) are used for iASL compiler only.
+#
+
+$(FINAL_PROG) : $(PROG)
+	$(COPYPROG)
+
+$(PROG) : $(INTERMEDIATES) $(MISC) $(OBJECTS)
+	$(LINKPROG)
+
+$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS)
+	$(COMPILEOBJ)
+
+clean :
+	rm -f $(PROG) $(PROG).exe $(OBJECTS) $(INTERMEDIATES) $(MISC)
+
+install :
+	$(INSTALLPROG)
diff --git a/generate/unix/acpibin/Makefile b/generate/unix/acpibin/Makefile
index e26f209d7c88..0ec293a64053 100644
--- a/generate/unix/acpibin/Makefile
+++ b/generate/unix/acpibin/Makefile
@@ -11,6 +11,7 @@
 # compile options, and prevents pollution of the source code.
 #
 include ../Makefile.config
+FINAL_PROG = ../$(BINDIR)/acpibin
 PROG = $(OBJDIR)/acpibin
 
 #
@@ -51,17 +52,6 @@ CFLAGS+= \
     -I$(ACPIBIN)
 
 #
-# Rules
+# Common Rules
 #
-$(PROG) : $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG)
-	$(COPYPROG)
-
-$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS)
-	$(COMPILE)
-
-clean :
-	rm -f $(PROG) $(PROG).exe $(OBJECTS)
-
-install :
-	$(INSTALLPROG)
+include ../Makefile.rules
diff --git a/generate/unix/acpiexec/Makefile b/generate/unix/acpiexec/Makefile
index 80ef514d7b3b..17ab8ad71b5f 100644
--- a/generate/unix/acpiexec/Makefile
+++ b/generate/unix/acpiexec/Makefile
@@ -13,6 +13,7 @@
 # compile options, and prevents pollution of the source code.
 #
 include ../Makefile.config
+FINAL_PROG = ../$(BINDIR)/acpiexec
 PROG = $(OBJDIR)/acpiexec
 
 #
@@ -191,12 +192,13 @@ OBJECTS = \
 	$(OBJDIR)/utmisc.o \
 	$(OBJDIR)/utmutex.o \
 	$(OBJDIR)/utobject.o \
+	$(OBJDIR)/utosi.o \
 	$(OBJDIR)/utresrc.o \
 	$(OBJDIR)/utstate.o \
 	$(OBJDIR)/uttrack.o \
-	$(OBJDIR)/utosi.o \
 	$(OBJDIR)/utxface.o \
 	$(OBJDIR)/utxferror.o \
+	$(OBJDIR)/utxfinit.o \
 	$(OBJDIR)/utxfmutex.o
 
 #
@@ -208,17 +210,6 @@ CFLAGS+= \
 LDFLAGS += -lpthread -lrt
 
 #
-# Rules
+# Common Rules
 #
-$(PROG) : $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG)
-	$(COPYPROG)
-
-$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS)
-	$(COMPILE)
-
-clean :
-	rm -f $(PROG) $(PROG).exe $(OBJECTS)
-
-install :
-	$(INSTALLPROG)
+include ../Makefile.rules
diff --git a/generate/unix/acpihelp/Makefile b/generate/unix/acpihelp/Makefile
index 30a690c9d1e9..c44bffefb5fe 100644
--- a/generate/unix/acpihelp/Makefile
+++ b/generate/unix/acpihelp/Makefile
@@ -12,6 +12,7 @@
 # compile options, and prevents pollution of the source code.
 #
 include ../Makefile.config
+FINAL_PROG = ../$(BINDIR)/acpihelp
 PROG = $(OBJDIR)/acpihelp
 
 #
@@ -43,17 +44,6 @@ CFLAGS+= \
     -I$(ACPIHELP)
 
 #
-# Rules
+# Common Rules
 #
-$(PROG) : $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG)
-	$(COPYPROG)
-
-$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS)
-	$(COMPILE)
-
-clean :
-	rm -f $(PROG) $(PROG).exe $(OBJECTS)
-
-install :
-	$(INSTALLPROG)
+include ../Makefile.rules
diff --git a/generate/unix/acpinames/Makefile b/generate/unix/acpinames/Makefile
index ed3304dbfa66..e60fcbc68d62 100644
--- a/generate/unix/acpinames/Makefile
+++ b/generate/unix/acpinames/Makefile
@@ -13,6 +13,7 @@
 # compile options, and prevents pollution of the source code.
 #
 include ../Makefile.config
+FINAL_PROG = ../$(BINDIR)/acpinames
 PROG = $(OBJDIR)/acpinames
 
 #
@@ -96,10 +97,11 @@ OBJECTS = \
 	$(OBJDIR)/utmisc.o \
 	$(OBJDIR)/utmutex.o \
 	$(OBJDIR)/utobject.o \
-	$(OBJDIR)/utstate.o \
 	$(OBJDIR)/utosi.o \
+	$(OBJDIR)/utstate.o \
+	$(OBJDIR)/utxface.o \
 	$(OBJDIR)/utxferror.o \
-	$(OBJDIR)/utxface.o
+	$(OBJDIR)/utxfinit.o
 
 #
 # Flags specific to acpinames utility
@@ -109,17 +111,6 @@ CFLAGS+= \
     -I$(ACPINAMES)
 
 #
-# Rules
+# Common Rules
 #
-$(PROG) : $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG)
-	$(COPYPROG)
-
-$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS)
-	$(COMPILE)
-
-clean :
-	rm -f $(PROG) $(PROG).exe $(OBJECTS)
-
-install :
-	$(INSTALLPROG)
+include ../Makefile.rules
diff --git a/generate/unix/acpisrc/Makefile b/generate/unix/acpisrc/Makefile
index abc8c2959ff3..9c9c578c419d 100644
--- a/generate/unix/acpisrc/Makefile
+++ b/generate/unix/acpisrc/Makefile
@@ -11,6 +11,7 @@
 # compile options, and prevents pollution of the source code.
 #
 include ../Makefile.config
+FINAL_PROG = ../$(BINDIR)/acpisrc
 PROG = $(OBJDIR)/acpisrc
 
 #
@@ -43,17 +44,6 @@ CFLAGS+= \
     -I$(ACPISRC)
 
 #
-# Rules
+# Common Rules
 #
-$(PROG) : $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG)
-	$(COPYPROG)
-
-$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS)
-	$(COMPILE)
-
-clean :
-	rm -f $(PROG) $(PROG).exe $(OBJECTS)
-
-install :
-	$(INSTALLPROG)
+include ../Makefile.rules
diff --git a/generate/unix/acpixtract/Makefile b/generate/unix/acpixtract/Makefile
index 9c0b2997e8f1..183aa0d94b5f 100644
--- a/generate/unix/acpixtract/Makefile
+++ b/generate/unix/acpixtract/Makefile
@@ -11,6 +11,7 @@
 # compile options, and prevents pollution of the source code.
 #
 include ../Makefile.config
+FINAL_PROG = ../$(BINDIR)/acpixtract
 PROG = $(OBJDIR)/acpixtract
 
 #
@@ -35,17 +36,6 @@ CFLAGS+= \
     -DACPI_XTRACT_APP \
 
 #
-# Rules
+# Common Rules
 #
-$(PROG) : $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG)
-	$(COPYPROG)
-
-$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS)
-	$(COMPILE)
-
-clean :
-	rm -f $(PROG) $(PROG).exe $(OBJECTS)
-
-install :
-	$(INSTALLPROG)
+include ../Makefile.rules
diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile
index 0a09aa0db9d8..fe7f98c00c37 100644
--- a/generate/unix/iasl/Makefile
+++ b/generate/unix/iasl/Makefile
@@ -11,6 +11,7 @@
 # compile options, and prevents pollution of the source code.
 #
 include ../Makefile.config
+FINAL_PROG = ../$(BINDIR)/iasl
 PROG = $(OBJDIR)/iasl
 
 #
@@ -179,8 +180,8 @@ OBJECTS = \
 	$(OBJDIR)/utobject.o \
 	$(OBJDIR)/utresrc.o \
 	$(OBJDIR)/utstate.o \
-	$(OBJDIR)/utxferror.o \
-	$(OBJDIR)/utxface.o
+	$(OBJDIR)/utxface.o \
+	$(OBJDIR)/utxferror.o
 
 INTERMEDIATES = \
 	$(OBJDIR)/aslcompilerlex.c \
@@ -210,11 +211,10 @@ CFLAGS+= \
     -I$(OBJDIR)
 
 #
-# Root rule
+# Common Rules
 #
-$(PROG) : $(INTERMEDIATES) $(MISC) $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG)
-	$(COPYPROG)
+include ../Makefile.rules
+
 
 #
 # Parser and Lexer - intermediate C files
@@ -238,8 +238,9 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prparserparse.h : $(ASL_COMPILER)/prparser.y
 	${YACC} ${YFLAGS} -pPrParser -o$@ $?
 
 
-# Rename headers produced by bison/yacc
-
+#
+# Rename the headers produced by bison/yacc
+#
 $(OBJDIR)/aslcompiler.y.h : $(OBJDIR)/aslcompilerparse.h
 	@echo Copy intermediate file:
 	@cp -f -v $(OBJDIR)/aslcompilerparse.h $(OBJDIR)/aslcompiler.y.h
@@ -276,13 +277,3 @@ $(OBJDIR)/prparserlex.o :      $(OBJDIR)/prparserlex.c
 
 $(OBJDIR)/prparserparse.o :    $(OBJDIR)/prparserparse.c
 	$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $?
-
-
-$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS)
-	$(COMPILE)
-
-clean :
-	rm -f $(PROG) $(PROG).exe $(OBJECTS) $(INTERMEDIATES) $(MISC)
-
-install :
-	$(INSTALLPROG)