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.

2 files changed, 7 insertions, 1 deletions

diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index 288f86ea3756..79d66e00b5ba 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 49a5b57c8ef6..5e27c26217c1 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>