Draft: Preview of WIP in refactoring ABI functions and related ELF/Mach-O changes.

.gitignore

@@ -63,7 +63,6 @@ scripts/sbin/pkg2ng
 /external/libucl/autom4te.cache
 /external/yxml/Makefile
 /external/liblua/Makefile
-/external/libmachista/Makefile
 /external/libfetch/Makefile
 /external/libelf/Makefile
 /external/sqlite/Makefile

auto.def

@@ -102,7 +102,7 @@ cc-with { -libs { -llzma }} {
 	}
 }
 if {[string match *-freebsd* [get-define host]]} {
-	define pkg_freebsd
+	define pkgos_freebsd
 	cc-with { -libs { -lmd }} {
 		if {![cc-check-functions SHA256_Data]} {
 			user-error "Unable to find libmd"
@@ -213,22 +213,14 @@ if {![cc-check-functions dlclose]} {
 	}
 }
 
-if {![cc-check-functions __res_query]} {
-	cc-with { -libs { -lresolv }} {
-		if {[cc-check-functions __res_query]} {
-			define-feature LIBRESOLV
-		}
-	}
-}
-
 cc-check-includes link.h machine/endian.h osreldate.h readpassphrase.h \
 	sys/procctl.h sys/statfs.h sys/statvfs.h libutil.h
 
 # for compat
 cc-check-includes dirent.h sys/sockio.h
 
 #endian stuff
-foreach header [list endian.h sys/endian.h] {
+foreach header [list endian.h sys/endian.h machine/endian.h] {
 	if {[cc-check-includes $header]} {
 		cc-with [list -includes $header] {
 			cc-check-decls be16dec be16enc be32dec be32enc be64dec be64enc \
@@ -238,9 +230,10 @@ foreach header [list endian.h sys/endian.h] {
 }
 
 if {[string match *-darwin* [get-define host]]} {
-	define libmachista
+	define pkgos_darwin
 	define waflags ""
 	define nowaflags ""
+	define libelf-internal
 } else {
 # libelf
 	define waflags "-Wl,-whole-archive"
@@ -394,7 +387,7 @@ make-template Makefile.autosetup Makefile
 foreach dir [list external/blake2 external/picosat \
 	external/linenoise external/sqlite \
 	external compat libpkg libpkg/repo libpkg/repo/binary src \
-	external/libucl external/libelf external/libmachista tests docs \
+	external/libucl external/libelf tests docs \
 	external/liblua external/yxml scripts external/libcurl external/libder \
 	external/libecc] {
 	make-template $dir/Makefile.autosetup $dir/Makefile

external/Makefile.autosetup

@@ -1,8 +1,5 @@
 include @builddir@/mk/defs.mk
 DIRS=	blake2 picosat linenoise sqlite libucl liblua yxml libder libecc
-@if libmachista
-DIRS+=	libmachista
-@endif
 @if libelf-internal
 DIRS+=	libelf
 @endif

external/libelf/_libelf_config.h

@@ -36,6 +36,10 @@
 #define	LIBELF_ARCH		EM_386
 #define	LIBELF_BYTEORDER	ELFDATA2LSB
 #define	LIBELF_CLASS		ELFCLASS32
+#elif   defined(__aarch64__)
+#define LIBELF_ARCH             EM_AARCH64
+#define LIBELF_BYTEORDER        ELFDATA2LSB
+#define LIBELF_CLASS            ELFCLASS64
 #endif
 
 #endif	/* __DragonFly__ */