strace: support aarch64

Author: rnpnr

pkg/strace/config.h

@@ -540,7 +540,7 @@
 # endif
 #endif
 /* #undef X32 */
-#define X86_64 1
+/* #undef X86_64 */
 /* #undef XTENSA */
 /* #undef gid_t */
 /* #undef typeof */

pkg/strace/gen.lua

@@ -1,14 +1,26 @@
-cflags{
+local arch = ({
+	aarch64='aarch64',
+	x86_64='x86_64',
+})[config.target.platform:match('[^-]*')]
+if not arch then error('unsupported arch') end
+
+local generic_cflags = {
 	'-D HAVE_CONFIG_H',
 	'-D IN_STRACE',
 	-- it is important that the arch-specific directory is searched first
-	'-I $srcdir/src/linux/x86_64',
+	'-I $srcdir/src/linux/' .. arch,
 	'-I $srcdir/src/linux/generic',
 	'-I $srcdir/src',
 	'-I $outdir',
 	'-isystem $builddir/pkg/linux-headers/include',
 }
 
+local arch_cflags = {}
+arch_cflags['aarch64'] = {'-D AARCH64=1', table.unpack(generic_cflags)}
+arch_cflags['x86_64']  = {'-D X86_64=1',  table.unpack(generic_cflags)}
+
+cflags(arch_cflags[arch])
+
 build('cat', '$outdir/config.h', {
 	'$builddir/probe/HAVE___BUILTIN_POPCOUNT',
 	'$dir/config.h',
@@ -21,17 +33,16 @@ build('sed', '$outdir/ioctl_iocdef.h', '$outdir/ioctl_iocdef.i', {
 
 sub('tools.ninja', function()
 	toolchain(config.host)
-	cflags{
-		'-D X86_64=1',
-		'-I $srcdir/src/linux/x86_64',
-		'-I $srcdir/src/linux',
-		'-I $outdir',
-	}
+	cflags(arch_cflags[arch])
+
+	local arch_h_count = {}
+	arch_h_count['aarch64'] = 1
+	arch_h_count['x86_64']  = 2
 
-	for i = 0, 2 do
+	for i = 0, arch_h_count[arch] do
 		build('cat', '$outdir/ioctls_all'..i..'.h', {
-			'$srcdir/src/linux/x86_64/ioctls_inc'..i..'.h',
-			'$srcdir/src/linux/x86_64/ioctls_arch'..i..'.h',
+			'$srcdir/src/linux/' .. arch .. '/ioctls_inc'  .. i .. '.h',
+			'$srcdir/src/linux/' .. arch .. '/ioctls_arch' .. i .. '.h',
 		})
 		build('cc', '$outdir/ioctlsort'..i..'.c.o', {
 			'$srcdir/src/ioctlsort.c',