Index: lib/libc/x86/sys/Makefile.inc
===================================================================
--- lib/libc/x86/sys/Makefile.inc	(revision 312171)
+++ lib/libc/x86/sys/Makefile.inc	(working copy)
@@ -4,3 +4,11 @@
 
 SRCS+= \
 	__vdso_gettc.c
+
+.if ${MK_ACPI} != "no"
+CFLAGS+=	-DWANT_ACPI
+.endif
+
+.if ${MK_HYPERV} != "no"
+CFLAGS+=	-DWANT_HYPERV
+.endif
Index: lib/libc/x86/sys/__vdso_gettc.c
===================================================================
--- lib/libc/x86/sys/__vdso_gettc.c	(revision 312171)
+++ lib/libc/x86/sys/__vdso_gettc.c	(working copy)
@@ -45,8 +45,10 @@
 #include <machine/atomic.h>
 #include <machine/cpufunc.h>
 #include <machine/specialreg.h>
+#ifdef WANT_ACPI
 #include <dev/acpica/acpi_hpet.h>
-#ifdef __amd64__
+#endif
+#ifdef WANT_HYPERV
 #include <dev/hyperv/hyperv.h>
 #endif
 #include "libc_private.h"
@@ -158,7 +160,7 @@
 		munmap((void *)new_map, PAGE_SIZE);
 }
 
-#ifdef __amd64__
+#ifdef WANT_HYPERV
 
 #define HYPERV_REFTSC_DEVPATH	"/dev/" HYPERV_REFTSC_DEVNAME
 
@@ -246,7 +248,7 @@
 			return (ENOSYS);
 		*tc = *(volatile uint32_t *)(map + HPET_MAIN_COUNTER);
 		return (0);
-#ifdef __amd64__
+#ifdef WANT_HYPERV
 	case VDSO_TH_ALGO_X86_HVTSC:
 		if (hyperv_ref_tsc == NULL)
 			__vdso_init_hyperv_tsc();