Merge pull request #435 from cyanogilvie/support-musl-std-libs

Support musl libc (Alpine) in the test harness

Author: vnmakarov

c-tests/runtests.sh

@@ -34,6 +34,13 @@ else
     ARCH="other"
 fi
 
+# busybox diff (e.g. on Alpine) lacks --strip-trailing-cr
+if diff --strip-trailing-cr /dev/null /dev/null >/dev/null 2>&1;then
+    DIFF_STRIP_CR=--strip-trailing-cr
+else
+    DIFF_STRIP_CR=
+fi
+
 runtest () {
 	t=$1
 	if test -f $t.mach && ! $GREP -E "`uname -m`" $t.mach >/dev/null; then
@@ -57,14 +64,14 @@ runtest () {
 	$TIMEOUT sh $execution_program $compiler $t $add_main 2>$stderrf >$outf
 	code=$?
 	if test $code = $expect_code; then
-	    if test x$expect_out != x && ! diff --strip-trailing-cr -up $expect_out $outf >$errf;then
+	    if test x$expect_out != x && ! diff $DIFF_STRIP_CR -up $expect_out $outf >$errf;then
 	            $ECHO Output mismatch
 		    cat $errf
             else
 		    ok=`expr $ok + 1`
 	            $ECHO -ne "OK               \r"
 	    fi
-	    if test x$stderr_expect_out != x && ! diff --strip-trailing-cr -up $stderr_expect_out $stderrf >$errf;then
+	    if test x$stderr_expect_out != x && ! diff $DIFF_STRIP_CR -up $stderr_expect_out $stderrf >$errf;then
 	            $ECHO Stderr mismatch
 		    cat $errf
             else

c2mir/aarch64/mirc_aarch64_linux.h

@@ -52,11 +52,13 @@ static char aarch64_mirc[]
     "#define __UINT32_MAX__ (__INT32_MAX__ * 2u + 1u)\n"
     "#define __UINT64_MAX__ (__INT64_MAX__ * 2u + 1u)\n"
 #if defined(__linux__)
-    "#define __WCHAR_MAX__ 0x7fffffff\n"
+    /* wchar_t is unsigned int in AAPCS64 */
+    "#define __WCHAR_MAX__ 4294967295u\n"
+    "#define __WCHAR_MIN__ 0u\n"
 #else
     "#define __WCHAR_MAX__ 2147483647\n"
-#endif
     "#define __WCHAR_MIN__ (-__WCHAR_MAX__ - 1)\n"
+#endif
     "#define __SCHAR_MAX__ __INT8_MAX__\n"
     "#define __SHRT_MAX__ __INT16_MAX__\n"
     "#define __INT_MAX__ __INT32_MAX__\n"

c2mir/aarch64/mirc_aarch64_stddef.h

@@ -10,7 +10,12 @@ static char stddef_str[]
     "typedef long ptrdiff_t;\n"
     "typedef unsigned long size_t;\n"
     "typedef long double max_align_t;\n"
+#if defined(__APPLE__)
     "typedef int wchar_t;\n"
+#else
+    /* unsigned in AAPCS64; matters because musl's alltypes.h redeclares it */
+    "typedef unsigned int wchar_t;\n"
+#endif
     "\n"
     "#define NULL ((void *) 0)\n"
     "\n"

c2mir/c2mir-driver.c

@@ -65,7 +65,29 @@ struct lib {
 typedef struct lib lib_t;
 
 #if defined(__unix__)
-#if UINTPTR_MAX == 0xffffffff
+#if defined(__linux__) && !defined(__GLIBC__)
+/* A non-glibc Linux libc, e.g. musl on Alpine: libc, libm, libpthread, and
+   libdl all live in one shared object, installed as the dynamic loader
+   /lib/ld-musl-<arch>.so.1 on musl.  */
+#if defined(__x86_64__)
+#define MUSL_LIB_ARCH "x86_64"
+#elif defined(__aarch64__)
+#define MUSL_LIB_ARCH "aarch64"
+#elif defined(__PPC64__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define MUSL_LIB_ARCH "powerpc64le"
+#elif defined(__PPC64__)
+#define MUSL_LIB_ARCH "powerpc64"
+#elif defined(__s390x__)
+#define MUSL_LIB_ARCH "s390x"
+#elif defined(__riscv)
+#define MUSL_LIB_ARCH "riscv64"
+#else
+#error cannot recognize the non-glibc linux target
+#endif
+static lib_t std_libs[]
+  = {{"/lib/ld-musl-" MUSL_LIB_ARCH ".so.1", NULL}, {"/usr/lib/libc.so", NULL}};
+static const char *std_lib_dirs[] = {"/lib", "/usr/lib"};
+#elif UINTPTR_MAX == 0xffffffff
 static lib_t std_libs[]
   = {{"/lib/libc.so", NULL},         {"/lib/libm.so", NULL},          {"/lib/libc.so.6", NULL},
      {"/lib32/libc.so.6", NULL},     {"/lib/libm.so.6", NULL},        {"/lib32/libm.so.6", NULL},

mir-bin-driver.c

@@ -24,7 +24,25 @@ static struct lib {
   char *name;
   void *handler;
 } libs[] = {
-#if !defined(__APPLE__)
+#if defined(__linux__) && !defined(__GLIBC__)
+/* A non-glibc Linux libc, e.g. musl on Alpine: everything lives in one
+   shared object, installed as the dynamic loader on musl.  */
+#if defined(__x86_64__)
+  {"/lib/ld-musl-x86_64.so.1", NULL}
+#elif defined(__aarch64__)
+  {"/lib/ld-musl-aarch64.so.1", NULL}
+#elif defined(__PPC64__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+  {"/lib/ld-musl-powerpc64le.so.1", NULL}
+#elif defined(__PPC64__)
+  {"/lib/ld-musl-powerpc64.so.1", NULL}
+#elif defined(__s390x__)
+  {"/lib/ld-musl-s390x.so.1", NULL}
+#elif defined(__riscv)
+  {"/lib/ld-musl-riscv64.so.1", NULL}
+#else
+#error cannot recognize the non-glibc linux target
+#endif
+#elif !defined(__APPLE__)
   {"/lib64/libc.so.6", NULL}, {"/lib64/libm.so.6", NULL}, {"/lib64/libpthread.so.0", NULL}
 #else
   {"/usr/lib/libc.dylib", NULL}, {"/usr/lib/libm.dylib", NULL}

mir-bin-run.c

@@ -28,7 +28,29 @@ typedef struct lib lib_t;
 
 /* stdlibs according to c2mir */
 #if defined(__unix__)
-#if UINTPTR_MAX == 0xffffffff
+#if defined(__linux__) && !defined(__GLIBC__)
+/* A non-glibc Linux libc, e.g. musl on Alpine: libc, libm, libpthread, and
+   libdl all live in one shared object, installed as the dynamic loader
+   /lib/ld-musl-<arch>.so.1 on musl.  */
+#if defined(__x86_64__)
+#define MUSL_LIB_ARCH "x86_64"
+#elif defined(__aarch64__)
+#define MUSL_LIB_ARCH "aarch64"
+#elif defined(__PPC64__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define MUSL_LIB_ARCH "powerpc64le"
+#elif defined(__PPC64__)
+#define MUSL_LIB_ARCH "powerpc64"
+#elif defined(__s390x__)
+#define MUSL_LIB_ARCH "s390x"
+#elif defined(__riscv)
+#define MUSL_LIB_ARCH "riscv64"
+#else
+#error cannot recognize the non-glibc linux target
+#endif
+static lib_t std_libs[]
+  = {{"/lib/ld-musl-" MUSL_LIB_ARCH ".so.1", NULL}, {"/usr/lib/libc.so", NULL}};
+static const char *std_lib_dirs[] = {"/lib", "/usr/lib"};
+#elif UINTPTR_MAX == 0xffffffff
 static lib_t std_libs[]
   = {{"/lib/libc.so.6", NULL},   {"/lib32/libc.so.6", NULL},     {"/lib/libm.so.6", NULL},
      {"/lib32/libm.so.6", NULL}, {"/lib/libpthread.so.0", NULL}, {"/lib32/libpthread.so.0", NULL}};