diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6acad7dcd3..06dc4248b4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,6 +148,7 @@ ELSE()
   ADD_COMPILE_FLAG("-Wno-unused-parameter")
   ADD_COMPILE_FLAG("-fno-omit-frame-pointer")
   IF(WIN32)
+    ADD_LINK_FLAG("-Wl,--stack,8388608")
     ADD_COMPILE_FLAG("-D_GNU_SOURCE")
   ELSE()
     ADD_COMPILE_FLAG("-fPIC")
diff --git a/src/support/file.cpp b/src/support/file.cpp
index fd38a7ae3cc..524e72f06e6 100644
--- a/src/support/file.cpp
+++ b/src/support/file.cpp
@@ -26,7 +26,8 @@ T wasm::read_file(const std::string &filename, Flags::BinaryOption binary, Flags
   if (debug == Flags::Debug) std::cerr << "Loading '" << filename << "'..." << std::endl;
   std::ifstream infile;
   std::ios_base::openmode flags = std::ifstream::in;
-  if (binary == Flags::Binary) flags |= std::ifstream::binary;
+  // asm2wasm.exe built with MinGW would crash with files containing '\r' when opened without the binary flag
+  /*if (binary == Flags::Binary) */flags |= std::ifstream::binary;
   infile.open(filename, flags);
   if (!infile.is_open()) {
     std::cerr << "Failed opening '" << filename << "'" << std::endl;