Date: Thu, 23 Jun 2011 17:28:46 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r223480 - in vendor-sys/acpica/dist: . compiler generate/unix generate/unix/acpibin generate/unix/acpiexec generate/unix/acpihelp generate/unix/acpinames generate/unix/acpisrc generate/... Message-ID: <201106231728.p5NHSkp3010143@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Thu Jun 23 17:28:46 2011 New Revision: 223480 URL: http://svn.freebsd.org/changeset/base/223480 Log: Import ACPICA 20110623. Added: vendor-sys/acpica/dist/generate/unix/acpibin/ vendor-sys/acpica/dist/generate/unix/acpibin/Makefile (contents, props changed) vendor-sys/acpica/dist/generate/unix/acpihelp/ vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile (contents, props changed) vendor-sys/acpica/dist/tools/acpibin/ vendor-sys/acpica/dist/tools/acpibin/Makefile (contents, props changed) vendor-sys/acpica/dist/tools/acpibin/abcompare.c (contents, props changed) vendor-sys/acpica/dist/tools/acpibin/abmain.c (contents, props changed) vendor-sys/acpica/dist/tools/acpibin/acpibin.h (contents, props changed) vendor-sys/acpica/dist/tools/acpihelp/ vendor-sys/acpica/dist/tools/acpihelp/Makefile (contents, props changed) vendor-sys/acpica/dist/tools/acpihelp/acpihelp.h (contents, props changed) vendor-sys/acpica/dist/tools/acpihelp/ahamlops.c (contents, props changed) vendor-sys/acpica/dist/tools/acpihelp/ahaslkey.c (contents, props changed) vendor-sys/acpica/dist/tools/acpihelp/ahaslops.c (contents, props changed) vendor-sys/acpica/dist/tools/acpihelp/ahdecode.c (contents, props changed) vendor-sys/acpica/dist/tools/acpihelp/ahmain.c (contents, props changed) vendor-sys/acpica/dist/tools/acpihelp/ahpredef.c (contents, props changed) Deleted: vendor-sys/acpica/dist/osunixxf.c vendor-sys/acpica/dist/tools/acpiexec/osunixdir.c vendor-sys/acpica/dist/tools/acpisrc/osunixdir.c Modified: vendor-sys/acpica/dist/README vendor-sys/acpica/dist/changes.txt vendor-sys/acpica/dist/compiler/Makefile vendor-sys/acpica/dist/compiler/aslcompiler.h vendor-sys/acpica/dist/compiler/aslerror.c vendor-sys/acpica/dist/compiler/aslstubs.c vendor-sys/acpica/dist/generate/unix/Makefile vendor-sys/acpica/dist/generate/unix/Makefile.config vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile vendor-sys/acpica/dist/generate/unix/acpinames/Makefile vendor-sys/acpica/dist/generate/unix/acpisrc/Makefile vendor-sys/acpica/dist/generate/unix/acpixtract/Makefile vendor-sys/acpica/dist/generate/unix/iasl/Makefile vendor-sys/acpica/dist/generate/unix/readme.txt vendor-sys/acpica/dist/include/acglobal.h vendor-sys/acpica/dist/include/aclocal.h vendor-sys/acpica/dist/include/acpixf.h vendor-sys/acpica/dist/include/platform/acenv.h vendor-sys/acpica/dist/include/platform/aclinux.h vendor-sys/acpica/dist/include/platform/acmsvc.h vendor-sys/acpica/dist/namespace/nspredef.c vendor-sys/acpica/dist/namespace/nsrepair2.c vendor-sys/acpica/dist/os_specific/service_layers/osunixxf.c vendor-sys/acpica/dist/os_specific/service_layers/oswinxf.c vendor-sys/acpica/dist/tools/acpiexec/Makefile vendor-sys/acpica/dist/tools/acpiexec/aemain.c vendor-sys/acpica/dist/tools/acpinames/Makefile vendor-sys/acpica/dist/tools/acpinames/anstubs.c vendor-sys/acpica/dist/tools/acpisrc/Makefile vendor-sys/acpica/dist/tools/acpisrc/acpisrc.h vendor-sys/acpica/dist/tools/acpixtract/Makefile vendor-sys/acpica/dist/tools/examples/examples.c Modified: vendor-sys/acpica/dist/README ============================================================================== --- vendor-sys/acpica/dist/README Thu Jun 23 16:34:41 2011 (r223479) +++ vendor-sys/acpica/dist/README Thu Jun 23 17:28:46 2011 (r223480) @@ -1,79 +1,137 @@ -acpica-unix ------------ +Makefiles for tool generation from the unix tarball +--------------------------------------------------- -This source release includes: +These makefiles are intended to generate the ACPICA utilities in +a Linux or Unix-like environment, from the ACPICA source code +as released in the unix tarball. +Windows binary versions of these tools are available at: -1) a cross-OS AML interpreter +http://www.acpica.org/downloads/binary_tools.php -This is intended to allow commercial and open source operating systems -to be enabled for ACPI. OS specific code is still needed, but the -AML interpreter should greatly improve the development speed of ACPI -support. +Documentation is available at acpica.org: -The AML interpreter source should be integrated into the kernel's -build process. We recommend establishing an automated method for -this, so later versions can also be incorporated easily. Please see -the documentation on the website for API and other implementation -information. +http://www.acpica.org/documentation/ +The acpica/source/tools directory contains the following utilities. +Note: These utilities are tested and supported as 32-bit versions +only. -2) iasl, an ASL compiler/decompiler +acpibin +acpiexec +acpihelp +acpinames +acpisrc +acpixtract +iasl -iasl compiles ASL (ACPI Source Language) into AML (ACPI Machine -Language). This AML is suitable for inclusion as a DSDT in system -firmware. It also can disassemble AML, for debugging purposes. + +Requirements +------------ + +make +gcc compiler (4+) +bison or yacc +flex or lex + + +Configuration +------------- + +The Makefiles contain this configuration information: + +HOST = _LINUX /* Host system, must appear in acenv.h */ +CC = gcc /* C compiler */ + + +1) acpibin, an AML file tool + +acpibin compares AML files, dumps AML binary files to text files, +extracts binary AML from text files, and other AML file +manipulation. To compile: -cd compiler +cd acpica/source/tools/acpibin make +make install /* install the binary to /usr/bin */ -It has been compiled on Linux, but should easily port to other Unix -environments. -Run 'iasl -h' for more information, or download the binary version for -documentation in PDF format. +2) acpiexec, a user-space AML interpreter +acpiexec allows the loading of ACPI tables and execution of control +methods from user space. Useful for debugging AML code and testing +the AML interpreter. Hardware access is simulated. -3) acpisrc, a source code conversion tool +To compile: + +cd acpica/source/tools/acpiexec +make +make install /* install the binary to /usr/bin */ -acpisrc converts the standard form of the acpica source release (included -here) into a version that meets Linux coding guidelines. This consists -mainly of performing a series of string replacements and transformations -to the code. + +3) acpihelp, syntax help for ASL operators and reserved names + +acpihelp displays the syntax for all of the ASL operators, as well +as information about the ASL/ACPI reserved names (4-char names that +start with underscore.) To compile: -cd tools/acpisrc +cd acpica/source/tools/acpihelp make +make install /* install the binary to /usr/bin */ -It has been compiled on Linux, but should easily port to other Unix -environments. +4) acpinames, load and dump acpi namespace -4) acpibin, an AML file tool +acpinames loads an ACPI namespace from a binary ACPI table file. +This is a smaller version of acpiexec that loads an acpi table and +dumps the resulting namespace. It is primarily intended to demonstrate +the configurability of ACPICA. -acpibin compares AML files, dumps AML binary files to text files, -extracts binary AML from text files, and other AML file -manipulation. +To compile: + +cd acpica/source/tools/acpinames +make +make install /* install the binary to /usr/bin */ + + +5) acpisrc, a source code conversion tool + +acpisrc converts the standard form of the acpica source release (included +here) into a version that meets Linux coding guidelines. This consists +mainly of performing a series of string replacements and transformations +to the code. It can also be used to clean the acpica source and generate +statistics. To compile: -cd tools/acpibin +cd acpica/source/tools/acpisrc make +make install /* install the binary to /usr/bin */ -5) acpiexec, a user-space AML interpreter +6) acpixtract, extract binary ACPI tables from an acpidump -acpiexec allows the loading of ACPI tables and execution of control -methods from user space. Useful for debugging AML code and testing -the AML interpreter. +acpixtract is used to extract binary ACPI tables from the ASCII text +output of an acpidump utility (available on several different hosts.) To compile: -cd tools/acpiexec +cd acpica/source/tools/acpixtract make +make install /* install the binary to /usr/bin */ -Thanks -- The ACPI CA Team +7) iasl, an optimizing ASL compiler/disassembler + +iasl compiles ASL (ACPI Source Language) into AML (ACPI Machine +Language). This AML is suitable for inclusion as a DSDT in system +firmware. It also can disassemble AML, for debugging purposes. + +To compile: + +cd acpica/source/compiler +make +make install /* install the binary to /usr/bin */ Modified: vendor-sys/acpica/dist/changes.txt ============================================================================== --- vendor-sys/acpica/dist/changes.txt Thu Jun 23 16:34:41 2011 (r223479) +++ vendor-sys/acpica/dist/changes.txt Thu Jun 23 17:28:46 2011 (r223480) @@ -1,7 +1,72 @@ ---------------------------------------- -27 May 2011. Summary of changes for version 20110527: +23 June 2011. Summary of changes for version 20110623: + +1) ACPI CA Core Subsystem: -This release is available at www.acpica.org/downloads +Updated the predefined name repair mechanism to not attempt repair of a _TSS +return object if a _PSS object is present. We can only sort the _TSS return +package if there is no _PSS within the same scope. This is because if _PSS is +present, the ACPI specification dictates that the _TSS Power Dissipation field +is to be ignored, and therefore some BIOSs leave garbage values in the _TSS +Power field(s). In this case, it is best to just return the _TSS package as- +is. Reported by, and fixed with assistance from Fenghua Yu. + +Added an option to globally disable the control method return value validation +and repair. This runtime option can be used to disable return value repair if +this is causing a problem on a particular machine. Also added an option to +AcpiExec (-dr) to set this disable flag. + +All makefiles and project files: Major changes to improve generation of ACPICA +tools. ACPICA BZ 912: + Reduce default optimization levels to improve compatibility + For Linux, add strict-aliasing=0 for gcc 4 + Cleanup and simplify use of command line defines + Cleanup multithread library support + Improve usage messages + +Linux-specific header: update handling of THREAD_ID and pthread. For the 32- +bit case, improve casting to eliminate possible warnings, especially with the +acpica tools. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug +version of the code includes the debug output trace mechanism and has a much +larger code and data size. + + Previous Release (VC 9.0): + Non-Debug Version: 90.1K Code, 23.9K Data, 114.0K Total + Debug Version: 165.6K Code, 68.4K Data, 234.0K Total + Current Release (VC 9.0): + Non-Debug Version: 90.2K Code, 23.9K Data, 114.1K Total + Debug Version: 165.6K Code, 68.4K Data, 234.0K Total + +2) iASL Compiler/Disassembler and Tools: + +With this release, a new utility named "acpihelp" has been added to the ACPICA +package. This utility summarizes the ACPI specification chapters for the ASL +and AML languages. It generates under Linux/Unix as well as Windows, and +provides the following functionality: + Find/display ASL operator(s) -- with description and syntax. + Find/display ASL keyword(s) -- with exact spelling and descriptions. + Find/display ACPI predefined name(s) -- with description, number + of arguments, and the return value data type. + Find/display AML opcode name(s) -- with opcode, arguments, and grammar. + Decode/display AML opcode -- with opcode name, arguments, and grammar. + +Service Layers: Make multi-thread support configurable. Conditionally compile +the multi-thread support so that threading libraries will not be linked if not +necessary. The only tool that requires multi-thread support is AcpiExec. + +iASL: Update yyerrror/AslCompilerError for "const" errors. Newer versions of +Bison appear to want the interface to yyerror to be a const char * (or at +least this is a problem when generating iASL on some systems.) ACPICA BZ 923 +Pierre Lejeune. + +Tools: Fix for systems where O_BINARY is not defined. Only used for Windows +versions of the tools. + +---------------------------------------- +27 May 2011. Summary of changes for version 20110527: 1) ACPI CA Core Subsystem: Modified: vendor-sys/acpica/dist/compiler/Makefile ============================================================================== --- vendor-sys/acpica/dist/compiler/Makefile Thu Jun 23 16:34:41 2011 (r223479) +++ vendor-sys/acpica/dist/compiler/Makefile Thu Jun 23 17:28:46 2011 (r223480) @@ -1,18 +1,57 @@ # # iASL compiler/disassembler # +# NOTE: This makefile is intended to be used in the Linux environment, +# with the Linux directory structure. It will not work directly +# on the native ACPICA source tree. +# -PROG= iasl +# +# Configuration +# Notes: +# gcc should be version 4 or greater, otherwise some of the options +# used will not be recognized. +# Global optimization flags (such as -O2, -Os) are not used, since +# they cause issues on some compilers. +# The _GNU_SOURCE symbol is required for many hosts. +# +PROG = iasl +HOST = _LINUX +NOMAN = YES +COMPILE = $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $? + +ACPICA_COMPONENTS = ACPICA_SRC = .. -ASL_COMPILER = $(ACPICA_SRC)/compiler ACPICA_COMMON = $(ACPICA_SRC)/common -ACPICA_CORE = $(ACPICA_SRC) +ACPICA_CORE = $(ACPICA_SRC)$(ACPICA_COMPONENTS) ACPICA_TOOLS = $(ACPICA_SRC)/tools ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers +ASL_COMPILER = $(ACPICA_SRC)/compiler +INSTALLDIR = /usr/bin +INSTALLPROG = cp --remove-destination $(PROG) $(INSTALLDIR) -NOMAN= YES -CFLAGS+= -Wall -O2 -Wstrict-prototypes -D_LINUX -DACPI_ASL_COMPILER -I../include -I../compiler +CFLAGS+= \ + -D$(HOST) \ + -D_GNU_SOURCE \ + -DACPI_ASL_COMPILER \ + -I$(ACPICA_SRC)/include \ + -I$(ASL_COMPILER) + +CWARNINGFLAGS = \ + -ansi \ + -Wall \ + -Wbad-function-cast \ + -Wdeclaration-after-statement \ + -Werror \ + -Wformat=2 \ + -Wmissing-declarations \ + -Wmissing-prototypes \ + -Wstrict-aliasing=0 \ + -Wstrict-prototypes \ + -Wswitch-default \ + -Wpointer-arith \ + -Wundef # # Bison/Flex configuration @@ -23,11 +62,6 @@ YFLAGS+= -v -d -y LEX= flex LFLAGS+= -i -s - -COMPILE = $(CC) -c $(CFLAGS) -o$@ $? -LDFLAGS += -lpthread -lrt - - OBJS = \ adfile.o \ adisasm.o \ @@ -182,7 +216,6 @@ MISC = \ # $(PROG) : $(INTERMEDIATES) $(OBJS) $(CC) $(OBJS) $(LDFLAGS) -o $(PROG) - $(COPYPROG) # @@ -210,16 +243,16 @@ dtparserparse.c : $(ASL_COMPILER)/dtp # by the utilities above and they are not necessarily ANSI C, etc. # aslcompilerlex.o : aslcompilerlex.c - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $? + $(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $? aslcompilerparse.o : aslcompilerparse.c - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $? + $(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $? dtparserlex.o : dtparserlex.c - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $? + $(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $? dtparserparse.o : dtparserparse.c - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $? + $(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $? # @@ -632,5 +665,8 @@ osunixxf.o : $(ACPICA_OSL)/osunix $(COMPILE) -clean : +clean : rm -f $(PROG) $(PROG).exe $(OBJS) $(INTERMEDIATES) $(MISC) + +install : + $(INSTALLPROG) Modified: vendor-sys/acpica/dist/compiler/aslcompiler.h ============================================================================== --- vendor-sys/acpica/dist/compiler/aslcompiler.h Thu Jun 23 16:34:41 2011 (r223479) +++ vendor-sys/acpica/dist/compiler/aslcompiler.h Thu Jun 23 17:28:46 2011 (r223480) @@ -289,7 +289,7 @@ AslCoreSubsystemError ( int AslCompilererror( - char *s); + const char *s); void AslCommonError ( Modified: vendor-sys/acpica/dist/compiler/aslerror.c ============================================================================== --- vendor-sys/acpica/dist/compiler/aslerror.c Thu Jun 23 16:34:41 2011 (r223479) +++ vendor-sys/acpica/dist/compiler/aslerror.c Thu Jun 23 17:28:46 2011 (r223480) @@ -620,13 +620,13 @@ AslCoreSubsystemError ( int AslCompilererror ( - char *CompilerMessage) + const char *CompilerMessage) { AslCommonError (ASL_ERROR, ASL_MSG_SYNTAX, Gbl_CurrentLineNumber, - Gbl_LogicalLineNumber, Gbl_CurrentLineOffset, - Gbl_CurrentColumn, Gbl_Files[ASL_FILE_INPUT].Filename, - CompilerMessage); + Gbl_LogicalLineNumber, Gbl_CurrentLineOffset, + Gbl_CurrentColumn, Gbl_Files[ASL_FILE_INPUT].Filename, + ACPI_CAST_PTR (char, CompilerMessage)); return 0; } Modified: vendor-sys/acpica/dist/compiler/aslstubs.c ============================================================================== --- vendor-sys/acpica/dist/compiler/aslstubs.c Thu Jun 23 16:34:41 2011 (r223479) +++ vendor-sys/acpica/dist/compiler/aslstubs.c Thu Jun 23 17:28:46 2011 (r223480) @@ -232,3 +232,20 @@ AcpiTbFindTable ( return (AE_SUPPORT); } +/* OSL interfaces */ + +ACPI_THREAD_ID +AcpiOsGetThreadId ( + void) +{ + return (0xFFFF); +} + +ACPI_STATUS +AcpiOsExecute ( + ACPI_EXECUTE_TYPE Type, + ACPI_OSD_EXEC_CALLBACK Function, + void *Context) +{ + return (AE_SUPPORT); +} Modified: vendor-sys/acpica/dist/generate/unix/Makefile ============================================================================== --- vendor-sys/acpica/dist/generate/unix/Makefile Thu Jun 23 16:34:41 2011 (r223479) +++ vendor-sys/acpica/dist/generate/unix/Makefile Thu Jun 23 17:28:46 2011 (r223480) @@ -1,28 +1,37 @@ # # Common make for acpica tools and utilities # + +# +# 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. +# include Makefile.config -all: ${DIRS} -${DIRS}: FORCE +all: ${PROGS} +${PROGS}: FORCE @cd $@; make; ls -al $@ clean: FORCE - @for d in ${DIRS}; do \ + @for d in ${PROGS}; do \ (cd $$d; \ if [ $$? -ne 0 ]; then \ - echo "Bad element of DIRS: <$$d>"; \ + echo "Bad element of PROGS: <$$d>"; \ else \ pwd; make clean; \ fi); \ done install: FORCE - @for d in ${DIRS}; do \ + @for d in ${PROGS}; do \ (cd $$d; \ if [ $$? -ne 0 ]; then \ - echo "Bad element of DIRS: <$$d>"; \ + echo "Bad element of PROGS: <$$d>"; \ else \ pwd; make install; \ fi); \ Modified: vendor-sys/acpica/dist/generate/unix/Makefile.config ============================================================================== --- vendor-sys/acpica/dist/generate/unix/Makefile.config Thu Jun 23 16:34:41 2011 (r223479) +++ vendor-sys/acpica/dist/generate/unix/Makefile.config Thu Jun 23 17:28:46 2011 (r223480) @@ -2,76 +2,94 @@ # Makefile.config # # Common configuration and setup file to generate the ACPICA tools and -# utilities: acpiexec, acpisrc, acpixtract, and the iASL compiler. +# utilities: the iASL compiler, acpiexec, acpihelp, acpinames, acpisrc, +# acpixtract, acpibin. # # This file is included by the individual makefiles for each tool. # # +# 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. +# + +# # Configuration -# Note: gcc should be version 4 or greater, otherwise some of the -# options used won't be recognized (see below) +# Notes: +# gcc should be version 4 or greater, otherwise some of the options +# used will not be recognized. +# Global optimization flags (such as -O2, -Os) are not used, since +# they cause issues on some compilers. +# The _GNU_SOURCE symbol is required for many hosts. # +PROGS = acpibin acpiexec acpihelp acpinames acpisrc acpixtract iasl + HOST = _CYGWIN CC = gcc -ACPICA_SRC = ../../../source -DIRS = acpiexec acpinames acpisrc acpixtract iasl -INSTALLDIR = /usr/bin +COMPILE = $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $? # # Common defines # -ASL_COMPILER = $(ACPICA_SRC)/compiler +ACPICA_SRC = ../../../source ACPICA_COMMON = $(ACPICA_SRC)/common ACPICA_CORE = $(ACPICA_SRC)/components ACPICA_TOOLS = $(ACPICA_SRC)/tools ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers -COMPILE = $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $? +ASL_COMPILER = $(ACPICA_SRC)/compiler COPYPROG = @mkdir -p ../bin; rm -f ../bin/$(PROG); cp --remove-destination $(PROG) ../bin +INSTALLDIR = /usr/bin INSTALLPROG = cp --remove-destination $(PROG) $(INSTALLDIR) - # # Common compiler flags. The warning flags in addition to -Wall are not # automatically included in -Wall. # -CFLAGS+= -Os -D$(HOST) -I$(ACPICA_SRC)/include -D_GNU_SOURCE +CFLAGS += \ + -D$(HOST) \ + -D_GNU_SOURCE \ + -I$(ACPICA_SRC)/include + CWARNINGFLAGS = \ - -ansi \ - -Wall \ - -Wbad-function-cast \ - -Wdeclaration-after-statement \ - -Werror \ - -Wformat=2 \ - -Wmissing-declarations \ - -Wmissing-prototypes \ - -Wstrict-aliasing=0 \ - -Wstrict-prototypes \ - -Wswitch-default \ - -Wpointer-arith \ - -Wundef + -ansi \ + -Wall \ + -Wbad-function-cast \ + -Wdeclaration-after-statement \ + -Werror \ + -Wformat=2 \ + -Wmissing-declarations \ + -Wmissing-prototypes \ + -Wstrict-aliasing=0 \ + -Wstrict-prototypes \ + -Wswitch-default \ + -Wpointer-arith \ + -Wundef # # gcc 4+ flags # -CWARNINGFLAGS+= \ - -Waddress \ - -Waggregate-return \ - -Wchar-subscripts \ - -Wempty-body \ - -Wlogical-op \ - -Wmissing-declarations \ - -Wmissing-field-initializers \ - -Wmissing-parameter-type \ - -Wnested-externs \ - -Wold-style-declaration \ - -Wold-style-definition \ - -Wredundant-decls \ - -Wtype-limits +CWARNINGFLAGS += \ + -Waddress \ + -Waggregate-return \ + -Wchar-subscripts \ + -Wempty-body \ + -Wlogical-op \ + -Wmissing-declarations \ + -Wmissing-field-initializers \ + -Wmissing-parameter-type \ + -Wnested-externs \ + -Wold-style-declaration \ + -Wold-style-definition \ + -Wredundant-decls \ + -Wtype-limits # # Extra warning flags (possible future use) # -#CWARNINGFLAGS+= \ +#CWARNINGFLAGS += \ # -Wcast-qual \ # -Wconversion # -Wshadow \ @@ -88,12 +106,11 @@ CWARNINGFLAGS+= \ # # Berkeley yacc configuration # -#YACC= byacc -#YFLAGS+= -v -d +#YACC= byacc +#YFLAGS += -v -d # -YACC= bison -YFLAGS+= -v -d -y - -LEX= flex -LFLAGS+= -i -s +YACC= bison +YFLAGS += -v -d -y +LEX= flex +LFLAGS += -i -s Added: vendor-sys/acpica/dist/generate/unix/acpibin/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-sys/acpica/dist/generate/unix/acpibin/Makefile Thu Jun 23 17:28:46 2011 (r223480) @@ -0,0 +1,109 @@ +# +# acpibin - Binary ACPI table utility +# + +# +# 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. +# +include ../Makefile.config +PROG = acpibin + +# +# Flags specific to acpibin +# +CFLAGS+= \ + -DACPI_BIN_APP \ + -I$(ACPICA_TOOLS)/acpibin + +OBJS = \ + abcompare.o \ + abmain.o \ + utalloc.o \ + utcache.o \ + utdebug.o \ + utdecode.o \ + utglobal.o \ + utlock.o \ + utmath.o \ + utmisc.o \ + utmutex.o \ + utstate.o \ + utxferror.o \ + osunixxf.o \ + getopt.o + +# +# Root rule +# +$(PROG) : $(OBJS) + $(CC) $(LDFLAGS) $(OBJS) -o $(PROG) + $(COPYPROG) + +# +# acpibin source +# +abcompare.o : $(ACPICA_TOOLS)/acpibin/abcompare.c + $(COMPILE) + +abmain.o : $(ACPICA_TOOLS)/acpibin/abmain.c + $(COMPILE) + +# +# ACPICA core source - common +# +getopt.o : $(ACPICA_COMMON)/getopt.c + $(COMPILE) + +# +# ACPICA core source +# +utalloc.o : $(ACPICA_CORE)/utilities/utalloc.c + $(COMPILE) + +utcache.o : $(ACPICA_CORE)/utilities/utcache.c + $(COMPILE) + +utdebug.o : $(ACPICA_CORE)/utilities/utdebug.c + $(COMPILE) + +utdecode.o : $(ACPICA_CORE)/utilities/utdecode.c + $(COMPILE) + +utglobal.o : $(ACPICA_CORE)/utilities/utglobal.c + $(COMPILE) + +utlock.o : $(ACPICA_CORE)/utilities/utlock.c + $(COMPILE) + +utmath.o : $(ACPICA_CORE)/utilities/utmath.c + $(COMPILE) + +utmisc.o : $(ACPICA_CORE)/utilities/utmisc.c + $(COMPILE) + +utmutex.o : $(ACPICA_CORE)/utilities/utmutex.c + $(COMPILE) + +utstate.o : $(ACPICA_CORE)/utilities/utstate.c + $(COMPILE) + +utxferror.o : $(ACPICA_CORE)/utilities/utxferror.c + $(COMPILE) + +# +# Unix OS services layer (OSL) +# +osunixxf.o : $(ACPICA_OSL)/osunixxf.c + $(COMPILE) + + +clean : + rm -f $(PROG) $(PROG).exe $(OBJS) + +install : + $(INSTALLPROG) Modified: vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile ============================================================================== --- vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile Thu Jun 23 16:34:41 2011 (r223479) +++ vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile Thu Jun 23 17:28:46 2011 (r223480) @@ -1,15 +1,27 @@ # -# AcpiExec utility +# acpiexec: ACPI execution simulator. Runs ACPICA code in user +# space. Loads ACPI tables, displays the namespace, and allows +# execution of control methods. # -include ../Makefile.config +# +# 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. +# +include ../Makefile.config PROG = acpiexec - # # Flags specific to acpiexec utility # -CFLAGS+= -DACPI_EXEC_APP -I$(ACPICA_TOOLS)/acpiexec +CFLAGS+= \ + -DACPI_EXEC_APP \ + -I$(ACPICA_TOOLS)/acpiexec +LDFLAGS += -lpthread -lrt OBJS = \ aeexec.o \ @@ -165,15 +177,13 @@ OBJS = \ utxferror.o \ utxface.o - # # Root rule # $(PROG) : $(OBJS) - $(CC) $(LDFLAGS) $(OBJS) -lpthread -o $(PROG) + $(CC) $(LDFLAGS) $(OBJS) -o $(PROG) $(COPYPROG) - # # acpiexec source # @@ -189,14 +199,12 @@ aemain.o : $(ACPICA_TOOLS)/acpi aetables.o : $(ACPICA_TOOLS)/acpiexec/aetables.c $(COMPILE) - # # ACPICA core source - common # getopt.o : $(ACPICA_COMMON)/getopt.c $(COMPILE) - # # ACPICA core source # @@ -638,7 +646,6 @@ utxferror.o : $(ACPICA_CORE)/utili utxface.o : $(ACPICA_CORE)/utilities/utxface.c $(COMPILE) - # # Unix OS services layer (OSL) # @@ -646,8 +653,8 @@ osunixxf.o : $(ACPICA_OSL)/osunix $(COMPILE) -clean : +clean : rm -f $(PROG) $(PROG).exe $(OBJS) -install : +install : $(INSTALLPROG) Added: vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile Thu Jun 23 17:28:46 2011 (r223480) @@ -0,0 +1,72 @@ +# +# acpihelp - ACPI Help utility. Displays ASL operator syntax and +# information about ACPI predefined names. +# + +# +# 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. +# +include ../Makefile.config +PROG = acpihelp + +# +# Flags specific to acpihelp +# +CFLAGS+= \ + -DACPI_HELP_APP \ + -I$(ACPICA_TOOLS)/acpihelp + +OBJS = \ + ahamlops.o \ + ahaslkey.o \ + ahaslops.o \ + ahdecode.o \ + ahpredef.o \ + ahmain.o \ + getopt.o + +# +# Root rule +# +$(PROG) : $(OBJS) + $(CC) $(LDFLAGS) $(OBJS) -o $(PROG) + $(COPYPROG) + +# +# acpihelp source +# +ahamlops.o : $(ACPICA_TOOLS)/acpihelp/ahamlops.c + $(COMPILE) + +ahaslkey.o : $(ACPICA_TOOLS)/acpihelp/ahaslkey.c + $(COMPILE) + +ahaslops.o : $(ACPICA_TOOLS)/acpihelp/ahaslops.c + $(COMPILE) + +ahdecode.o : $(ACPICA_TOOLS)/acpihelp/ahdecode.c + $(COMPILE) + +ahpredef.o : $(ACPICA_TOOLS)/acpihelp/ahpredef.c + $(COMPILE) + +ahmain.o : $(ACPICA_TOOLS)/acpihelp/ahmain.c + $(COMPILE) + +# +# ACPICA core source - common +# +getopt.o : $(ACPICA_COMMON)/getopt.c + $(COMPILE) + + +clean : + rm -f $(PROG) $(PROG).exe $(OBJS) + +install : + $(INSTALLPROG) Modified: vendor-sys/acpica/dist/generate/unix/acpinames/Makefile ============================================================================== --- vendor-sys/acpica/dist/generate/unix/acpinames/Makefile Thu Jun 23 16:34:41 2011 (r223479) +++ vendor-sys/acpica/dist/generate/unix/acpinames/Makefile Thu Jun 23 17:28:46 2011 (r223480) @@ -1,15 +1,26 @@ # -# AcpiNames utility +# acpinames - Load ACPI table and dump namespace. This is a subset +# of the AcpiExec functionality, it is intended to demonstrate +# the configurability of ACPICA. # -include ../Makefile.config +# +# 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. +# +include ../Makefile.config PROG = acpinames - # # Flags specific to acpinames utility # -CFLAGS+= -DACPI_APPLICATION -DACPI_SINGLE_THREADED -DACPI_DEBUGGER -I$(ACPICA_TOOLS)/acpinames +CFLAGS+= \ + -DACPI_NAMES_APP \ + -I$(ACPICA_TOOLS)/acpinames OBJS = \ anmain.o \ @@ -76,15 +87,13 @@ OBJS = \ utxferror.o \ utxface.o - # # Root rule # $(PROG) : $(OBJS) - $(CC) $(LDFLAGS) $(OBJS) -lpthread -o $(PROG) + $(CC) $(LDFLAGS) $(OBJS) -o $(PROG) $(COPYPROG) - # # acpinames source # @@ -97,14 +106,12 @@ anstubs.o : $(ACPICA_TOOLS)/acpi antables.o : $(ACPICA_TOOLS)/acpinames/antables.c $(COMPILE) - # # ACPICA core source - common # getopt.o : $(ACPICA_COMMON)/getopt.c $(COMPILE) - # # ACPICA core source # @@ -282,7 +289,6 @@ utxferror.o : $(ACPICA_CORE)/utili utxface.o : $(ACPICA_CORE)/utilities/utxface.c $(COMPILE) - # # Unix OS services layer (OSL) # @@ -290,8 +296,8 @@ osunixxf.o : $(ACPICA_OSL)/osunix $(COMPILE) -clean : +clean : rm -f $(PROG) $(PROG).exe $(OBJS) -install : +install : $(INSTALLPROG) Modified: vendor-sys/acpica/dist/generate/unix/acpisrc/Makefile ============================================================================== --- vendor-sys/acpica/dist/generate/unix/acpisrc/Makefile Thu Jun 23 16:34:41 2011 (r223479) +++ vendor-sys/acpica/dist/generate/unix/acpisrc/Makefile Thu Jun 23 17:28:46 2011 (r223480) @@ -1,15 +1,24 @@ # -# acpisrc utility +# acpisrc - ACPICA source code conversion utility # -include ../Makefile.config +# +# 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. *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106231728.p5NHSkp3010143>