Move mach symbols back to FBSD_1.4. Build wpa with mach.

lib/libsys/Symbol.sys.map

@@ -335,6 +335,58 @@ FBSD_1.3 {
 FBSD_1.4 {
 	futimens;
 	utimensat;
+	ppoll;
+	__iopolicysys;
+	__proc_info;
+	_kernelrpc_mach_vm_allocate_trap;
+	_kernelrpc_mach_vm_deallocate_trap;
+	_kernelrpc_mach_vm_protect_trap;
+	_kernelrpc_mach_vm_map_trap;
+	_kernelrpc_mach_port_allocate_trap;
+	_kernelrpc_mach_port_destroy_trap;
+	_kernelrpc_mach_port_deallocate_trap;
+	_kernelrpc_mach_port_mod_refs_trap;
+	_kernelrpc_mach_port_move_member_trap;
+	_kernelrpc_mach_port_insert_right_trap;
+	_kernelrpc_mach_port_insert_member_trap;
+	_kernelrpc_mach_port_extract_member_trap;
+	_kernelrpc_mach_port_construct_trap;
+	_kernelrpc_mach_port_destruct_trap;
+	mach_reply_port;
+	thread_self_trap;
+	task_self_trap;
+	host_self_trap;
+	mach_msg_trap;
+	mach_msg_overwrite_trap;
+	semaphore_signal_trap;
+	semaphore_signal_all_trap;
+	semaphore_signal_thread_trap;
+	semaphore_wait_trap;
+	semaphore_wait_signal_trap	;
+	semaphore_timedwait_trap;
+	semaphore_timedwait_signal_trap;
+	_kernelrpc_mach_port_guard_trap;
+	_kernelrpc_mach_port_unguard_trap;
+	task_name_for_pid;
+	task_for_pid;
+	pid_for_task;
+	macx_swapon;
+	macx_swapoff;
+	macx_triggers;
+	swtch_pri;
+	swtch;
+	thread_switch;
+	clock_sleep_trap;
+	mach_timebase_info;
+	mach_wait_until;
+	mk_timer_create;
+	mk_timer_destroy;
+	mk_timer_arm;
+	mk_timer_cancel;
+	numa_setaffinity;
+	numa_getaffinity;
+	sendmmsg;
+	recvmmsg;
 };
 
 FBSD_1.5 {

usr.sbin/wpa/Makefile.inc

@@ -11,8 +11,6 @@ HOSTAPD_DISTDIR?=	${WPA_DISTDIR}/hostapd
 
 .PATH.c:${.CURDIR:H}
 
-# Undef __MACH__ until we have a proper CF
-CFLAGS+=-U__MACH__
 CFLAGS+=-I${.CURDIR}
 CFLAGS+=-I${HOSTAPD_DISTDIR}
 CFLAGS+=-I${WPA_DISTDIR}/src
@@ -114,3 +112,8 @@ NEED_FIPS186_2_PRF=y
 CFLAGS+=-DEAP_GPSK_SHA256
 NEED_AES_OMAC1=y
 .endif
+
+CFLAGS+=-I${SRCTOP}/Frameworks
+CFLAGS+=-I${SRCTOP}/include
+LDFLAGS+=-L${OBJTOP}/lib/libmach -lmach
+LDFLAGS+=-L${OBJTOP}/lib/libthr -lthr