libacpi: fix build errors

Author: kpowkitty

stand/efi/Makefile

@@ -6,7 +6,7 @@ SUBDIR.yes+=	libefi
 SUBDIR.${MK_LOADER_IA32}+=	libefi32
 SUBDIR.${MK_FDT}+=	fdt
 SUBDIR.yes+=	libacpi
-SUBDIR.yes+=	liblua
+SUBDIR.${MK_LOADER_IA32}+=	libacpi32
 SUBDIR.yes+=	.WAIT
 
 SUBDIR.yes+=	boot1 gptboot
@@ -16,4 +16,8 @@ SUBDIR.${MK_LOADER_LUA}+= loader_lua
 SUBDIR.${MK_LOADER_IA32}+= loader_ia32
 SUBDIR.yes+=	loader_simp
 
+.if !defined(MK_FORTH) && !defined(MK_LOADER_IA32) && defined(MK_LOADER_LUA)
+SUBDIR.yes+=	liblua
+.endif
+
 .include <bsd.subdir.mk>

stand/efi/libacpi/Makefile

@@ -3,9 +3,13 @@
 LIB=	acpi
 
 SRCS+= acpi_detect.c
-CFLAGS+= -I${.CURDIR}/include
 
-.if ${MACHINE} == "amd64"
+CFLAGS+=	-I${EFISRC}/include
+CFLAGS+=	-I${EFISRC}/include/${MACHINE}
+CFLAGS+=	-I${SYSDIR}/contrib/dev/acpica/include
+CFLAGS+=	-I${EFISRC}/libacpi
+
+.if ${MACHINE} == "amd64" && ${DO32:U0} == 0 
 CFLAGS+=	-DACPI_SINGLE_THREADED \
 		-DACPI_USE_NATIVE_RSDP_POINTER \
 		-DACPI_USE_NATIVE_MEMORY_MAPPING \
@@ -49,10 +53,8 @@ SRCS+=	libefi.c OsdMemory.c osunixxf.c utinit.c utglobal.c utresrc.c utlock.c \
 	psloop.c pstree.c pswalk.c psopinfo.c psscope.c psutils.c psargs.c \
 	psparse.c psxface.c psopcode.c init_acpi.c
 
-CFLAGS+=	-I${SYSDIR}/contrib/dev/acpica/include
-CFLAGS+=	-I${EFISRC}/include
-CFLAGS+=	-I${.CURDIR}/acpi/include
-CFLAGS+=	-I${EFISRC}/include/${MACHINE_ARCH}
+CFLAGS+=	-I${EFISRC}/libacpi/acpi/include
+
 .endif # amd64
 
 .include <bsd.lib.mk>

stand/efi/libacpi/include/acpi_detect.h renamed to stand/efi/libacpi/acpi_detect.h

@@ -0,0 +1,4 @@
+DO32=1
+
+.PATH:  ${.CURDIR}/../libacpi
+.include "${.CURDIR}/../libacpi/Makefile"

stand/efi/libacpi32/Makefile

@@ -66,7 +66,7 @@ CFLAGS+=	-I${.CURDIR}/arch/${__arch}
 CFLAGS+=	-I${EFISRC}/include
 CFLAGS+=	-I${EFISRC}/include/${__arch}
 CFLAGS+=	-I${SYSDIR}/contrib/dev/acpica/include
-CFLAGS+=	-I${EFISRC}/libacpi/include
+CFLAGS+=	-I${EFISRC}/libacpi
 CFLAGS+=	-I${BOOTSRC}/i386/libi386
 CFLAGS+=	-DEFI
 
@@ -143,18 +143,21 @@ ${LOADER}.efi: ${PROG}
 LIBEFI=		${BOOTOBJ}/efi/libefi/libefi.a
 LIBEFI32=	${BOOTOBJ}/efi/libefi32/libefi.a
 LIBACPI=	${BOOTOBJ}/efi/libacpi/libacpi.a
+LIBACPI32=	${BOOTOBJ}/efi/libacpi32/libacpi.a
 
 .if ${__arch} == "i386"
-DPADD=		${LDR_INTERP32} ${LIBEFI32} ${LIBSA32} ${LDSCRIPT}
-LDADD=		${LDR_INTERP32} ${LIBEFI32} ${LIBSA32}
-.elif ${__arch} == "amd64"
-DPADD=		${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} \
-		${LIBSA} ${LIBACPI} ${LIBLUA} ${LDSCRIPT}
-LDADD=		${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} \
-		${LIBSA} ${LIBACPI} ${LIBLUA}
+DPADD=		${LDR_INTERP32} ${LIBEFI32} ${LIBSA32} ${LIBACPI32} ${LDSCRIPT}
+LDADD=		${LDR_INTERP32} ${LIBEFI32} ${LIBSA32} ${LIBACPI32}
 .else
-DPADD=		${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA} ${LDSCRIPT}
-LDADD=		${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA}
+DPADD=		${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA} \
+		${LIBACPI} ${LDSCRIPT}
+LDADD=		${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA} \
+		${LIBACPI}
+.endif
+
+.if ${__arch} == "amd64" && ${DO32:U0} == 0
+DPADD+=		${LIBLUA}
+LDADD+=		${LIBLUA}
 .endif
 
 .include <bsd.prog.mk>

stand/efi/loader/Makefile

@@ -67,9 +67,12 @@
 #include "acconfig.h"
 #define ACPI_SYSTEM_XFACE
 
-#if defined(__amd64__)
+// If defined amd64 && loader_lua
+#if defined(__amd64__) && defined(MK_LOADER_LUA)
 #include <init_acpi.h>
 #include <lacpi.h>
+#else
+#include <acpi.h>
 #endif
 #include "actypes.h" // init_acpi creates redefinition
 #include "actbl.h"
@@ -1234,7 +1237,7 @@ main(int argc, CHAR16 *argv[])
 
 	devinit();
 
-#if defined(__amd64__)
+#if defined(__amd64__) && defined(MK_LOADER_LUA)
 	/* Initialize ACPI Subsystem and Tables. */
 	if ((ret = init_acpi()) != 0) {
 		printf("Failed to initialize ACPI\n.");