Merge branch 'master' into v2.1

diff --cc src/host/buildvm_lib.c
index b125ea122d885c59723c72c759798073874a0e0d,47195fd4ee333a1e58e7018df34d40142fbda8b8..8914251edee76204c50b0f2c266e62b39670506d
--- 1/src/host/buildvm_lib.c
--- 2/src/host/buildvm_lib.c
+++ b/src/host/buildvm_lib.c
@@@ -378,15 -319,19 +378,21 @@@ void emit_lib(BuildCtx *ctx
        char *p;
        /* Simplistic pre-processor. Only handles top-level #if/#endif. */
        if (buf[0] == '#' && buf[1] == 'i' && buf[2] == 'f') {
-       int ok = 1;
-       if (!strcmp(buf, "#if LJ_52\n"))
+       int ok = 1, len = strlen(buf);
+       if (buf[len-1] == '\n') {
+         buf[len-1] = 0;
+         if (buf[len-2] == '\r') {
+           buf[len-2] = 0;
+         }
+       }
+       if (!strcmp(buf, "#if LJ_52"))
          ok = LJ_52;
-       else if (!strcmp(buf, "#if LJ_HASJIT\n"))
+       else if (!strcmp(buf, "#if LJ_HASJIT"))
          ok = LJ_HASJIT;
-       else if (!strcmp(buf, "#if LJ_HASFFI\n"))
+       else if (!strcmp(buf, "#if LJ_HASFFI"))
          ok = LJ_HASFFI;
-       else if (!strcmp(buf, "#if LJ_HASBUFFER\n"))
++      else if (!strcmp(buf, "#if LJ_HASBUFFER"))
 +        ok = LJ_HASBUFFER;
        if (!ok) {
          int lvl = 1;
          while (fgets(buf, sizeof(buf), fp) != NULL) {