Initial for alpine linux support.

Author: Matthew MacGregor

.vscode/settings.json

@@ -0,0 +1,18 @@
+{
+    "files.associations": {
+        "array": "c",
+        "atomic": "c",
+        "complex": "c",
+        "chrono": "c",
+        "ratio": "c",
+        "string_view": "c",
+        "system_error": "c",
+        "type_traits": "c",
+        "functional": "c",
+        "istream": "c",
+        "ostream": "c",
+        "sstream": "c",
+        "streambuf": "c"
+    },
+    "C_Cpp.errorSquiggles": "disabled"
+}

Makefile

@@ -13,8 +13,10 @@ chibicc: $(OBJS)
 
 $(OBJS): chibicc.h
 
+# Note: -include include/stdarg.h resolves missing va_list with musl, but
+# is not needed for platforms with glibc
 test/%.exe: chibicc test/%.c
-	./chibicc -Iinclude -Itest -c -o test/$*.o test/$*.c
+	./chibicc -include include/stdarg.h -Iinclude -Itest -c -o test/$*.o test/$*.c
 	$(CC) -pthread -o $@ test/$*.o -xc test/common
 
 test: $(TESTS)

chibicc.h

@@ -95,6 +95,7 @@ noreturn void error(char *fmt, ...) __attribute__((format(printf, 1, 2)));
 noreturn void error_at(char *loc, char *fmt, ...) __attribute__((format(printf, 2, 3)));
 noreturn void error_tok(Token *tok, char *fmt, ...) __attribute__((format(printf, 2, 3)));
 void warn_tok(Token *tok, char *fmt, ...) __attribute__((format(printf, 2, 3)));
+void print_tok(Token *tok, char *fmt, ...) __attribute__((format(printf, 2, 3)));
 bool equal(Token *tok, char *op);
 Token *skip(Token *tok, char *op);
 bool consume(Token **rest, Token *tok, char *str);

include/stdarg.h

@@ -54,4 +54,10 @@ static void *__va_arg_fp(__va_elem *ap, int sz, int align) {
 #define __GNUC_VA_LIST 1
 typedef va_list __gnuc_va_list;
 
+#ifndef va_list
+// TODO: this is necessary on Alpine linux; there must be a better condition
+// to check than if we have va_list defined at this point.
+typedef va_list __builtin_va_list;
+#endif
+
 #endif

main.c

@@ -593,6 +593,8 @@ static char *find_libpath(void) {
     return "/usr/lib/x86_64-linux-gnu";
   if (file_exists("/usr/lib64/crti.o"))
     return "/usr/lib64";
+  if (file_exists("/usr/lib/crti.o"))
+    return "/usr/lib";
   error("library path is not found");
 }
 
@@ -601,6 +603,7 @@ static char *find_gcc_libpath(void) {
     "/usr/lib/gcc/x86_64-linux-gnu/*/crtbegin.o",
     "/usr/lib/gcc/x86_64-pc-linux-gnu/*/crtbegin.o", // For Gentoo
     "/usr/lib/gcc/x86_64-redhat-linux/*/crtbegin.o", // For Fedora
+    "/usr/lib/gcc/x86_64-alpine-linux-musl/*/crtbegin.o" // For Alpine
   };
 
   for (int i = 0; i < sizeof(paths) / sizeof(*paths); i++) {
@@ -645,7 +648,11 @@ static void run_linker(StringArray *inputs, char *output) {
 
   if (!opt_static) {
     strarray_push(&arr, "-dynamic-linker");
-    strarray_push(&arr, "/lib64/ld-linux-x86-64.so.2");
+    if (file_exists("/lib64/ld-linux-x86-64.so.2")) {
+      strarray_push(&arr, "/lib64/ld-linux-x86-64.so.2"); // ubuntu 20.04
+    } else if (file_exists("/lib/ld-musl-x86_64.so.1")) {
+      strarray_push(&arr, "/lib/ld-musl-x86_64.so.1"); // alpine
+    }
   }
 
   for (int i = 0; i < ld_extra_args.len; i++)

parse.c

@@ -1506,8 +1506,9 @@ static bool is_typename(Token *tok) {
       "_Thread_local", "__thread", "_Atomic",
     };
 
-    for (int i = 0; i < sizeof(kw) / sizeof(*kw); i++)
+    for (int i = 0; i < sizeof(kw) / sizeof(*kw); i++) {
       hashmap_put(&map, kw[i], (void *)1);
+    }
   }
 
   return hashmap_get2(&map, tok->loc, tok->len) || find_typedef(tok);
@@ -3131,13 +3132,16 @@ static Token *parse_typedef(Token *tok, Type *basety) {
   bool first = true;
 
   while (!consume(&tok, tok, ";")) {
-    if (!first)
+    if (!first) {
       tok = skip(tok, ",");
+    }
     first = false;
 
     Type *ty = declarator(&tok, tok, basety);
-    if (!ty->name)
+    if (!ty->name) {
       error_tok(ty->name_pos, "typedef name omitted");
+    }
+
     push_scope(get_ident(ty->name))->type_def = ty;
   }
   return tok;

tokenize.c

@@ -75,15 +75,27 @@ void warn_tok(Token *tok, char *fmt, ...) {
   va_end(ap);
 }
 
+void print_tok(Token *tok, char *fmt, ...) {
+  va_list ap;
+  va_start(ap, fmt);
+  verror_at(tok->file->name, tok->file->contents, tok->line_no, tok->loc, fmt, ap);
+  va_end(ap);
+}
+
 // Consumes the current token if it matches `op`.
 bool equal(Token *tok, char *op) {
   return memcmp(tok->loc, op, tok->len) == 0 && op[tok->len] == '\0';
 }
 
 // Ensure that the current token is `op`.
 Token *skip(Token *tok, char *op) {
-  if (!equal(tok, op))
+  if (!equal(tok, op)) {
+    char tmp[256] = {0};
+    memcpy(tmp, tok->loc, tok->len);
+    printf("tok: %s, op: %s\n", tmp, op);
     error_tok(tok, "expected '%s'", op);
+  }
+
   return tok->next;
 }