summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2003-08-09 19:11:20 +0000
committermarcel <marcel@FreeBSD.org>2003-08-09 19:11:20 +0000
commite97cb4c9d9258d16d93694547b11732f0e7bed5a (patch)
treeb5aeff70d2b4e65e632fc8247c80a8c0275305c6 /usr.sbin
parentc37c941215a68987b1783af2e3055b2bc4d90001 (diff)
downloadFreeBSD-src-e97cb4c9d9258d16d93694547b11732f0e7bed5a.zip
FreeBSD-src-e97cb4c9d9258d16d93694547b11732f0e7bed5a.tar.gz
Apparently I limited my testing of the ductape and bubblegum solution
to acpidb. The same problem exists in iasl. Add JIT patching there too. Add a comment to both makefiles to increase the chance that both kludges are removed when a real solution is committed.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/acpi/acpidb/Makefile1
-rw-r--r--usr.sbin/acpi/iasl/Makefile7
2 files changed, 7 insertions, 1 deletions
diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index 288f86e..79d66e0 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -39,6 +39,7 @@ MAN= acpidb.8
CFLAGS+= -DACPI_APPLICATION -DACPI_DEBUG_OUTPUT -DACPI_DEBUGGER \
-DACPI_DISASSEMBLER
+# The following band-aid is also present in ../iasl/Makefile
CLEANFILES+= osunixxf-xxx.c
osunixxf-xxx.c: osunixxf.c
cat ${.ALLSRC} | sed -e 's/UINT32 *length/ACPI_SIZE length/g' -e 's/UINT32 *size/ACPI_SIZE size/g' -e 's/(UINT32) where/(uintptr_t)where/g' > ${.TARGET}
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index 49a5b57..5e27c26 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -7,7 +7,7 @@ SRCS+= aslcompilerparse.c aslcompilerlex.c aslanalyze.c aslcodegen.c \
aslmap.c aslopcodes.c asloperands.c aslresource.c \
aslrestype1.c aslrestype2.c asltree.c aslutils.c \
asltransform.c aslfold.c aslstubs.c aslopt.c
-SRCS+= adisasm.c getopt.c osunixxf.c
+SRCS+= adisasm.c getopt.c osunixxf-xxx.c
SRCS+= dbfileio.c dmbuffer.c dmnames.c dmopcode.c dmobject.c \
dmresrc.c dmresrcl.c dmresrcs.c dmutils.c dmwalk.c \
dsopcode.c dsutils.c dswexec.c dswload.c \
@@ -49,4 +49,9 @@ aslcompilerlex.c: aslcompiler.l
${LEX} ${LFLAGS} -PAslCompiler -oaslcompilerlex.c \
${ACPICA_DIR}/compiler/aslcompiler.l
+# The following band-aid is also present in ../acpidb/Makefile
+CLEANFILES+= osunixxf-xxx.c
+osunixxf-xxx.c: osunixxf.c
+ cat ${.ALLSRC} | sed -e 's/UINT32 *length/ACPI_SIZE length/g' -e 's/UINT32 *size/ACPI_SIZE size/g' -e 's/(UINT32) where/(uintptr_t)where/g' > ${.TARGET}
+
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud