diff options
author | Robert Moore <Robert.Moore@intel.com> | 2016-06-15 10:51:12 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-15 10:51:12 -0700 |
commit | d776c9ee6e67f3b7a186d809763558ca7a358710 (patch) | |
tree | 22aee76d7f384a2553421abf763747a229bf0680 /generate | |
parent | 8aac0be3c840747a032b63e7365c99190e2a0ba9 (diff) | |
download | acpica-d776c9ee6e67f3b7a186d809763558ca7a358710.tar.gz |
Revert "Efi edk2"revert-143-efi-edk2
Diffstat (limited to 'generate')
-rw-r--r-- | generate/efi/Makefile.config | 9 | ||||
-rw-r--r-- | generate/efi/acpidump/Makefile | 5 | ||||
-rw-r--r-- | generate/efi/acpiexec/Makefile | 255 | ||||
-rw-r--r-- | generate/unix/acpibin/Makefile | 1 | ||||
-rw-r--r-- | generate/unix/acpidump/Makefile | 1 | ||||
-rw-r--r-- | generate/unix/acpiexamples/Makefile | 1 | ||||
-rw-r--r-- | generate/unix/acpiexec/Makefile | 1 | ||||
-rw-r--r-- | generate/unix/acpihelp/Makefile | 1 | ||||
-rw-r--r-- | generate/unix/acpinames/Makefile | 1 | ||||
-rw-r--r-- | generate/unix/acpisrc/Makefile | 5 | ||||
-rw-r--r-- | generate/unix/acpixtract/Makefile | 1 | ||||
-rw-r--r-- | generate/unix/iasl/Makefile | 1 |
12 files changed, 13 insertions, 269 deletions
diff --git a/generate/efi/Makefile.config b/generate/efi/Makefile.config index 1f3aa74d4..d7872c8ac 100644 --- a/generate/efi/Makefile.config +++ b/generate/efi/Makefile.config @@ -47,7 +47,7 @@ # # Common defines # -PROGS = acpidump acpiexec +PROGS = acpidump HOST = $(shell uname -m | sed s,i[3456789]86,ia32,) TARGET = $(shell uname -m | sed s,i[3456789]86,ia32,) SHARED ?= true @@ -79,7 +79,6 @@ ACPICA_UTILITIES = $(ACPICA_CORE)/utilities # ACPICA tool and utility source directories # ACPIDUMP = $(ACPICA_TOOLS)/acpidump -ACPIEXEC = $(ACPICA_TOOLS)/acpiexec # # Common ACPICA header files @@ -96,23 +95,17 @@ LD = ld OBJCOPY = objcopy CFLAGS = \ - --save-temps\ - -nostdinc\ - -nostdlib\ -std=c99\ -U__linux__\ -U_LINUX\ -D_GNU_EFI\ -D_GNU_SOURCE\ - -fno-builtin\ - -iwithprefix include\ -fno-stack-protector\ -fno-strict-aliasing\ -fpic\ -fshort-wchar\ -I$(ACPICA_INCLUDE) LDFLAGS = \ - -nostdinc\ -nostdlib\ -znocombreloc\ -Bsymbolic diff --git a/generate/efi/acpidump/Makefile b/generate/efi/acpidump/Makefile index 39fa364d0..16bd52a81 100644 --- a/generate/efi/acpidump/Makefile +++ b/generate/efi/acpidump/Makefile @@ -32,19 +32,16 @@ OBJECTS = \ $(OBJDIR)/apmain.o\ $(OBJDIR)/cmfsize.o\ $(OBJDIR)/getopt.o\ - $(OBJDIR)/oseficlib.o\ $(OBJDIR)/osefitbl.o\ $(OBJDIR)/osefixf.o\ $(OBJDIR)/tbprint.o\ $(OBJDIR)/tbxfroot.o\ - $(OBJDIR)/utascii.o\ $(OBJDIR)/utbuffer.o\ - $(OBJDIR)/utclib.o\ $(OBJDIR)/utdebug.o\ + $(OBJDIR)/utclib.o\ $(OBJDIR)/utexcep.o\ $(OBJDIR)/utglobal.o\ $(OBJDIR)/utmath.o\ - $(OBJDIR)/utnonansi.o\ $(OBJDIR)/utprint.o\ $(OBJDIR)/utstring.o\ $(OBJDIR)/utxferror.o diff --git a/generate/efi/acpiexec/Makefile b/generate/efi/acpiexec/Makefile deleted file mode 100644 index aedcb6b14..000000000 --- a/generate/efi/acpiexec/Makefile +++ /dev/null @@ -1,255 +0,0 @@ - -# -# acpiexec: ACPI execution simulator. Runs ACPICA code in user -# space. Loads ACPI tables, displays the namespace, and allows -# execution of control methods. -# - -# -# 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 -FINAL_PROG = ../$(BINDIR)/acpiexec -PROG = $(OBJDIR)/acpiexec - -# -# Search paths for source files -# -vpath %.c \ - $(ACPIEXEC)\ - $(ACPICA_DEBUGGER)\ - $(ACPICA_DISASSEMBLER)\ - $(ACPICA_DISPATCHER)\ - $(ACPICA_EVENTS)\ - $(ACPICA_EXECUTER)\ - $(ACPICA_HARDWARE)\ - $(ACPICA_NAMESPACE)\ - $(ACPICA_PARSER)\ - $(ACPICA_RESOURCES)\ - $(ACPICA_TABLES)\ - $(ACPICA_UTILITIES)\ - $(ACPICA_COMMON)\ - $(ACPICA_OSL) - -HEADERS = \ - $(wildcard $(ACPIEXEC)/*.h) - -OBJECTS = \ - $(OBJDIR)/acfileio.o\ - $(OBJDIR)/acgetline.o\ - $(OBJDIR)/aeexec.o\ - $(OBJDIR)/aehandlers.o\ - $(OBJDIR)/aeinitfile.o\ - $(OBJDIR)/aemain.o\ - $(OBJDIR)/aeregion.o\ - $(OBJDIR)/aetables.o\ - $(OBJDIR)/ahids.o\ - $(OBJDIR)/ahuuids.o\ - $(OBJDIR)/cmfsize.o\ - $(OBJDIR)/dbcmds.o\ - $(OBJDIR)/dbconvert.o\ - $(OBJDIR)/dbdisply.o\ - $(OBJDIR)/dbexec.o\ - $(OBJDIR)/dbfileio.o\ - $(OBJDIR)/dbhistry.o\ - $(OBJDIR)/dbinput.o\ - $(OBJDIR)/dbmethod.o\ - $(OBJDIR)/dbnames.o\ - $(OBJDIR)/dbobject.o\ - $(OBJDIR)/dbstats.o\ - $(OBJDIR)/dbtest.o\ - $(OBJDIR)/dbutils.o\ - $(OBJDIR)/dbxface.o\ - $(OBJDIR)/dmbuffer.o\ - $(OBJDIR)/dmcstyle.o\ - $(OBJDIR)/dmdeferred.o\ - $(OBJDIR)/dmnames.o\ - $(OBJDIR)/dmopcode.o\ - $(OBJDIR)/dmresrc.o\ - $(OBJDIR)/dmresrcl.o\ - $(OBJDIR)/dmresrcl2.o\ - $(OBJDIR)/dmresrcs.o\ - $(OBJDIR)/dmutils.o\ - $(OBJDIR)/dmwalk.o\ - $(OBJDIR)/dsargs.o\ - $(OBJDIR)/dscontrol.o\ - $(OBJDIR)/dsdebug.o\ - $(OBJDIR)/dsfield.o\ - $(OBJDIR)/dsinit.o\ - $(OBJDIR)/dsmethod.o\ - $(OBJDIR)/dsmthdat.o\ - $(OBJDIR)/dsobject.o\ - $(OBJDIR)/dsopcode.o\ - $(OBJDIR)/dsutils.o\ - $(OBJDIR)/dswexec.o\ - $(OBJDIR)/dswload.o\ - $(OBJDIR)/dswload2.o\ - $(OBJDIR)/dswscope.o\ - $(OBJDIR)/dswstate.o\ - $(OBJDIR)/evevent.o\ - $(OBJDIR)/evglock.o\ - $(OBJDIR)/evgpe.o\ - $(OBJDIR)/evgpeblk.o\ - $(OBJDIR)/evgpeinit.o\ - $(OBJDIR)/evgpeutil.o\ - $(OBJDIR)/evhandler.o\ - $(OBJDIR)/evmisc.o\ - $(OBJDIR)/evregion.o\ - $(OBJDIR)/evrgnini.o\ - $(OBJDIR)/evsci.o\ - $(OBJDIR)/evxface.o\ - $(OBJDIR)/evxfevnt.o\ - $(OBJDIR)/evxfgpe.o\ - $(OBJDIR)/evxfregn.o\ - $(OBJDIR)/exconcat.o\ - $(OBJDIR)/exconfig.o\ - $(OBJDIR)/exconvrt.o\ - $(OBJDIR)/excreate.o\ - $(OBJDIR)/exdebug.o\ - $(OBJDIR)/exdump.o\ - $(OBJDIR)/exfield.o\ - $(OBJDIR)/exfldio.o\ - $(OBJDIR)/exmisc.o\ - $(OBJDIR)/exmutex.o\ - $(OBJDIR)/exnames.o\ - $(OBJDIR)/exoparg1.o\ - $(OBJDIR)/exoparg2.o\ - $(OBJDIR)/exoparg3.o\ - $(OBJDIR)/exoparg6.o\ - $(OBJDIR)/exprep.o\ - $(OBJDIR)/exregion.o\ - $(OBJDIR)/exresnte.o\ - $(OBJDIR)/exresolv.o\ - $(OBJDIR)/exresop.o\ - $(OBJDIR)/exstore.o\ - $(OBJDIR)/exstoren.o\ - $(OBJDIR)/exstorob.o\ - $(OBJDIR)/exsystem.o\ - $(OBJDIR)/extrace.o\ - $(OBJDIR)/exutils.o\ - $(OBJDIR)/getopt.o\ - $(OBJDIR)/hwacpi.o\ - $(OBJDIR)/hwesleep.o\ - $(OBJDIR)/hwgpe.o\ - $(OBJDIR)/hwpci.o\ - $(OBJDIR)/hwregs.o\ - $(OBJDIR)/hwsleep.o\ - $(OBJDIR)/hwvalid.o\ - $(OBJDIR)/hwxface.o\ - $(OBJDIR)/hwxfsleep.o\ - $(OBJDIR)/nsaccess.o\ - $(OBJDIR)/nsalloc.o\ - $(OBJDIR)/nsarguments.o\ - $(OBJDIR)/nsconvert.o\ - $(OBJDIR)/nsdump.o\ - $(OBJDIR)/nsdumpdv.o\ - $(OBJDIR)/nseval.o\ - $(OBJDIR)/nsinit.o\ - $(OBJDIR)/nsload.o\ - $(OBJDIR)/nsnames.o\ - $(OBJDIR)/nsobject.o\ - $(OBJDIR)/nsparse.o\ - $(OBJDIR)/nspredef.o\ - $(OBJDIR)/nsprepkg.o\ - $(OBJDIR)/nsrepair.o\ - $(OBJDIR)/nsrepair2.o\ - $(OBJDIR)/nssearch.o\ - $(OBJDIR)/nsutils.o\ - $(OBJDIR)/nswalk.o\ - $(OBJDIR)/nsxfeval.o\ - $(OBJDIR)/nsxfname.o\ - $(OBJDIR)/nsxfobj.o\ - $(OBJDIR)/psargs.o\ - $(OBJDIR)/psloop.o\ - $(OBJDIR)/psobject.o\ - $(OBJDIR)/psopcode.o\ - $(OBJDIR)/psopinfo.o\ - $(OBJDIR)/psparse.o\ - $(OBJDIR)/psscope.o\ - $(OBJDIR)/pstree.o\ - $(OBJDIR)/psutils.o\ - $(OBJDIR)/pswalk.o\ - $(OBJDIR)/psxface.o\ - $(OBJDIR)/rsaddr.o\ - $(OBJDIR)/rscalc.o\ - $(OBJDIR)/rscreate.o\ - $(OBJDIR)/rsdump.o\ - $(OBJDIR)/rsdumpinfo.o\ - $(OBJDIR)/rsinfo.o\ - $(OBJDIR)/rsio.o\ - $(OBJDIR)/rsirq.o\ - $(OBJDIR)/rslist.o\ - $(OBJDIR)/rsmemory.o\ - $(OBJDIR)/rsmisc.o\ - $(OBJDIR)/rsserial.o\ - $(OBJDIR)/rsutils.o\ - $(OBJDIR)/rsxface.o\ - $(OBJDIR)/tbdata.o\ - $(OBJDIR)/tbfadt.o\ - $(OBJDIR)/tbfind.o\ - $(OBJDIR)/tbinstal.o\ - $(OBJDIR)/tbprint.o\ - $(OBJDIR)/tbutils.o\ - $(OBJDIR)/tbxface.o\ - $(OBJDIR)/tbxfload.o\ - $(OBJDIR)/tbxfroot.o\ - $(OBJDIR)/utaddress.o\ - $(OBJDIR)/utalloc.o\ - $(OBJDIR)/utascii.o\ - $(OBJDIR)/utbuffer.o\ - $(OBJDIR)/utcache.o\ - $(OBJDIR)/utclib.o\ - $(OBJDIR)/utcopy.o\ - $(OBJDIR)/utdebug.o\ - $(OBJDIR)/utdecode.o\ - $(OBJDIR)/utdelete.o\ - $(OBJDIR)/uterror.o\ - $(OBJDIR)/uteval.o\ - $(OBJDIR)/utexcep.o\ - $(OBJDIR)/utglobal.o\ - $(OBJDIR)/uthex.o\ - $(OBJDIR)/utids.o\ - $(OBJDIR)/utinit.o\ - $(OBJDIR)/utlock.o\ - $(OBJDIR)/utmath.o\ - $(OBJDIR)/utmisc.o\ - $(OBJDIR)/utmutex.o\ - $(OBJDIR)/utnonansi.o\ - $(OBJDIR)/utobject.o\ - $(OBJDIR)/utosi.o\ - $(OBJDIR)/utownerid.o\ - $(OBJDIR)/utpredef.o\ - $(OBJDIR)/utprint.o\ - $(OBJDIR)/utresrc.o\ - $(OBJDIR)/utstate.o\ - $(OBJDIR)/utstring.o\ - $(OBJDIR)/uttrack.o\ - $(OBJDIR)/utuuid.o\ - $(OBJDIR)/utxface.o\ - $(OBJDIR)/utxferror.o\ - $(OBJDIR)/utxfinit.o\ - $(OBJDIR)/oseficlib.o\ - $(OBJDIR)/osefixf.o\ - $(OBJDIR)/utxfmutex.o - -# -# Flags specific to acpiexec utility -# -CFLAGS += \ - -DACPI_EXEC_APP\ - -I$(ACPIEXEC) - -ifeq ($(ASLTS),TRUE) -CFLAGS += \ - -DACPI_CHECKSUM_ABORT=TRUE -endif - -# -# Common Rules -# -include ../Makefile.rules diff --git a/generate/unix/acpibin/Makefile b/generate/unix/acpibin/Makefile index 511d71091..e856499a5 100644 --- a/generate/unix/acpibin/Makefile +++ b/generate/unix/acpibin/Makefile @@ -47,6 +47,7 @@ OBJECTS = \ $(OBJDIR)/utstate.o\ $(OBJDIR)/utstring.o\ $(OBJDIR)/utxferror.o\ + $(OBJDIR)/oslibcfs.o\ $(OBJDIR)/osunixxf.o # diff --git a/generate/unix/acpidump/Makefile b/generate/unix/acpidump/Makefile index bc3430613..d6e19644c 100644 --- a/generate/unix/acpidump/Makefile +++ b/generate/unix/acpidump/Makefile @@ -33,6 +33,7 @@ OBJECTS = \ $(OBJDIR)/apmain.o\ $(OBJDIR)/cmfsize.o\ $(OBJDIR)/getopt.o\ + $(OBJDIR)/oslibcfs.o\ $(OBJDIR)/osunixdir.o\ $(OBJDIR)/osunixmap.o\ $(OBJDIR)/osunixxf.o\ diff --git a/generate/unix/acpiexamples/Makefile b/generate/unix/acpiexamples/Makefile index b22b84883..54d74739e 100644 --- a/generate/unix/acpiexamples/Makefile +++ b/generate/unix/acpiexamples/Makefile @@ -107,6 +107,7 @@ OBJECTS = \ $(OBJDIR)/nsxfeval.o\ $(OBJDIR)/nsxfname.o\ $(OBJDIR)/nsxfobj.o\ + $(OBJDIR)/oslibcfs.o\ $(OBJDIR)/osunixxf.o\ $(OBJDIR)/psargs.o\ $(OBJDIR)/psloop.o\ diff --git a/generate/unix/acpiexec/Makefile b/generate/unix/acpiexec/Makefile index 33e516caf..7f8befabb 100644 --- a/generate/unix/acpiexec/Makefile +++ b/generate/unix/acpiexec/Makefile @@ -163,6 +163,7 @@ OBJECTS = \ $(OBJDIR)/nsxfeval.o\ $(OBJDIR)/nsxfname.o\ $(OBJDIR)/nsxfobj.o\ + $(OBJDIR)/oslibcfs.o\ $(OBJDIR)/osunixxf.o\ $(OBJDIR)/psargs.o\ $(OBJDIR)/psloop.o\ diff --git a/generate/unix/acpihelp/Makefile b/generate/unix/acpihelp/Makefile index 4290a153f..d50e416c8 100644 --- a/generate/unix/acpihelp/Makefile +++ b/generate/unix/acpihelp/Makefile @@ -38,6 +38,7 @@ OBJECTS = \ $(OBJDIR)/ahtable.o\ $(OBJDIR)/ahuuids.o\ $(OBJDIR)/getopt.o\ + $(OBJDIR)/oslibcfs.o\ $(OBJDIR)/osunixxf.o\ $(OBJDIR)/utdebug.o\ $(OBJDIR)/utexcep.o\ diff --git a/generate/unix/acpinames/Makefile b/generate/unix/acpinames/Makefile index a7dd6a9ee..4ff5558f0 100644 --- a/generate/unix/acpinames/Makefile +++ b/generate/unix/acpinames/Makefile @@ -72,6 +72,7 @@ OBJECTS = \ $(OBJDIR)/nsxfeval.o\ $(OBJDIR)/nsxfname.o\ $(OBJDIR)/nsxfobj.o\ + $(OBJDIR)/oslibcfs.o\ $(OBJDIR)/osunixxf.o\ $(OBJDIR)/psargs.o\ $(OBJDIR)/psloop.o\ diff --git a/generate/unix/acpisrc/Makefile b/generate/unix/acpisrc/Makefile index 931b33d71..93a9868cf 100644 --- a/generate/unix/acpisrc/Makefile +++ b/generate/unix/acpisrc/Makefile @@ -36,14 +36,15 @@ OBJECTS = \ $(OBJDIR)/asutils.o\ $(OBJDIR)/cmfsize.o\ $(OBJDIR)/getopt.o \ + $(OBJDIR)/oslibcfs.o\ $(OBJDIR)/osunixdir.o\ $(OBJDIR)/osunixxf.o\ - $(OBJDIR)/utascii.o\ + $(OBJDIR)/utascii.o\ $(OBJDIR)/utdebug.o\ $(OBJDIR)/utexcep.o\ $(OBJDIR)/utglobal.o\ $(OBJDIR)/utmath.o\ - $(OBJDIR)/utnonansi.o\ + $(OBJDIR)/utnonansi.o\ $(OBJDIR)/utprint.o\ $(OBJDIR)/utstring.o\ $(OBJDIR)/utxferror.o diff --git a/generate/unix/acpixtract/Makefile b/generate/unix/acpixtract/Makefile index 22b3294ee..272cbd091 100644 --- a/generate/unix/acpixtract/Makefile +++ b/generate/unix/acpixtract/Makefile @@ -31,6 +31,7 @@ OBJECTS = \ $(OBJDIR)/axmain.o\ $(OBJDIR)/axutils.o\ $(OBJDIR)/getopt.o\ + $(OBJDIR)/oslibcfs.o\ $(OBJDIR)/osunixxf.o\ $(OBJDIR)/utascii.o\ $(OBJDIR)/utdebug.o\ diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile index 949dd180a..a3759cc85 100644 --- a/generate/unix/iasl/Makefile +++ b/generate/unix/iasl/Makefile @@ -177,6 +177,7 @@ OBJECTS = \ $(OBJDIR)/nswalk.o\ $(OBJDIR)/nsxfobj.o\ $(OBJDIR)/osunixxf.o\ + $(OBJDIR)/oslibcfs.o\ $(OBJDIR)/prexpress.o\ $(OBJDIR)/prmacros.o\ $(OBJDIR)/prscan.o\ |