Workarounds for missing -municode support

Author: Blackhex

winsup/configure.ac

@@ -73,6 +73,8 @@ esac
 
 AC_SUBST(DLL_ENTRY)
 
+AM_CONDITIONAL(BUILD_X86_64, [test $build_cpu = "x86_64"])
+AM_CONDITIONAL(BUILD_AARCH64, [test $build_cpu = "aarch64"])
 AM_CONDITIONAL(TARGET_X86_64, [test $target_cpu = "x86_64"])
 AM_CONDITIONAL(TARGET_AARCH64, [test $target_cpu = "aarch64"])
 
@@ -109,9 +111,9 @@ if test -z "$XMLTO"; then
 fi
 
 if test "x$with_cross_bootstrap" != "xyes"; then
-    AC_CHECK_PROGS(MINGW_CXX, ${target_cpu}-w64-mingw32-g++)
+    AC_CHECK_PROGS(MINGW_CXX, ${build_cpu}-w64-mingw32-g++)
     test -n "$MINGW_CXX" || AC_MSG_ERROR([no acceptable MinGW g++ found in \$PATH])
-    AC_CHECK_PROGS(MINGW_CC, ${target_cpu}-w64-mingw32-gcc)
+    AC_CHECK_PROGS(MINGW_CC, ${build_cpu}-w64-mingw32-gcc)
     test -n "$MINGW_CC" || AC_MSG_ERROR([no acceptable MinGW gcc found in \$PATH])
 fi
 AM_CONDITIONAL(CROSS_BOOTSTRAP, [test "x$with_cross_bootstrap" != "xyes"])

winsup/testsuite/mingw/Makefile.am

@@ -27,5 +27,7 @@ cygload_LDFLAGS=-static -Wl,-e,cygloadCRTStartup
 
 winchild_SOURCES = \
 	../winsup.api/posix_spawn/winchild.c
+if BUILD_X86_64
 winchild_LDFLAGS=-municode
+endif
 winchild_LDADD=-lntdll

winsup/testsuite/winsup.api/posix_spawn/winchild.c

@@ -5,6 +5,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#if defined(__aarch64__)
+int WinMain(
+  HINSTANCE hInstance,
+  HINSTANCE hPrevInstance,
+  LPSTR lpCmdLine,
+  int nShowCmd
+) {
+
+}
+#endif
+
 int wmain (int argc, wchar_t **argv)
 {
   if (argc != 3)