kernel/acpica: Don't use ACPICA's own versions of various POSIX functions.
authorSascha Wildner <saw@online.de>
Thu, 9 Oct 2014 08:29:44 +0000 (10:29 +0200)
committerSascha Wildner <saw@online.de>
Thu, 9 Oct 2014 10:24:18 +0000 (12:24 +0200)
This removes the need to compile utclib.c into the kernel, so remove it
from the list.

sys/conf/files
sys/contrib/dev/acpica/source/include/platform/acdragonfly.h
sys/dev/acpica/Makefile

index 186f3b7..1ed8789 100644 (file)
@@ -2242,7 +2242,6 @@ ${ACPICA_COMP_DIR}/utilities/utaddress.c  optional acpi
 ${ACPICA_COMP_DIR}/utilities/utalloc.c         optional acpi
 ${ACPICA_COMP_DIR}/utilities/utbuffer.c                optional acpi
 ${ACPICA_COMP_DIR}/utilities/utcache.c         optional acpi
-${ACPICA_COMP_DIR}/utilities/utclib.c          optional acpi
 ${ACPICA_COMP_DIR}/utilities/utcopy.c          optional acpi
 ${ACPICA_COMP_DIR}/utilities/utdebug.c         optional acpi
 ${ACPICA_COMP_DIR}/utilities/utdecode.c                optional acpi
index 1ea8793..bc2b642 100644 (file)
 
 #define ACPI_UINTPTR_T         uintptr_t
 #define ACPI_USE_DO_WHILE_0
+#define ACPI_USE_SYSTEM_CLIBRARY
 
 #ifdef _KERNEL
 
@@ -182,9 +183,7 @@ struct acpicache;
 
 #else /* _KERNEL */
 
-/* Always use DragonFly code over our local versions */
 #define ACPI_USE_STANDARD_HEADERS
-#define ACPI_USE_SYSTEM_CLIBRARY
 
 #define ACPI_CAST_PTHREAD_T(pthread)    ((ACPI_THREAD_ID) ACPI_TO_INTEGER (pthread))
 #define ACPI_FLUSH_CPU_CACHE()
index b2c1a3e..a073596 100644 (file)
@@ -58,7 +58,7 @@ SRCS+=        rsaddr.c rscalc.c rscreate.c rsdump.c rsdumpinfo.c rsinfo.c rsio.c
 SRCS+= rsirq.c rslist.c rsmemory.c rsmisc.c rsserial.c rsutils.c
 SRCS+= rsxface.c tbdata.c tbfadt.c tbfind.c tbinstal.c tbprint.c
 SRCS+= tbutils.c tbxface.c tbxfload.c tbxfroot.c utalloc.c utbuffer.c
-SRCS+= utaddress.c utclib.c utcopy.c
+SRCS+= utaddress.c utcopy.c
 SRCS+= utdebug.c utdecode.c utdelete.c uterror.c uteval.c utexcep.c
 SRCS+= utglobal.c uthex.c utids.c utinit.c utlock.c
 SRCS+= utmath.c utmisc.c utmutex.c utobject.c utosi.c utownerid.c utpredef.c