Fixing amalgamate under ARM

lemire · lemire · commit 76da6599776b · 2019-07-30T22:10:48.000Z
diff --git a/Dockerfile b/Dockerfile
@@ -3,6 +3,7 @@ FROM gcc:8.3
 COPY . /usr/src/
 WORKDIR /usr/src/
 RUN make clean
+RUN make amalgamate
 RUN make
 RUN make test
 RUN make parsingcompetition
diff --git a/amalgamation.sh b/amalgamation.sh
@@ -114,6 +114,9 @@ cat <<< '
 #include "simdjson.h"
 #include "simdjson.cpp"
 int main(int argc, char *argv[]) {
+  if(argc < 2) {
+    std::cerr << "Please specify a filename " << std::endl;
+  }
   const char * filename = argv[1];
   simdjson::padded_string p = simdjson::get_corpus(filename);
   simdjson::ParsedJson pj = simdjson::build_parsed_json(p); // do the parsing
diff --git a/include/simdjson/stage1_find_marks_flatten_haswell.h b/include/simdjson/stage1_find_marks_flatten_haswell.h
@@ -9,6 +9,8 @@
 #include "simdjson/common_defs.h"
 #include "simdjson/portability.h"
 
+#ifdef IS_X86_64
+
 TARGET_HASWELL
 namespace simdjson {
 namespace haswell {
@@ -82,5 +84,5 @@ really_inline void flatten_bits(uint32_t *base_ptr, uint32_t &base,
 } // namespace haswell
 } // namespace simdjson
 UNTARGET_REGION
-
+#endif // IS_X86_64
 #endif // SIMDJSON_STAGE1_FIND_MARKS_FLATTEN_H
