Merge pull request #2119 from meme/m1

Build on M1

Author: vaughnbetz

abc/src/misc/util/abc_global.h

@@ -84,6 +84,10 @@
   #endif
 #endif
 
+#ifdef __APPLE__
+  #define ABC_USE_STDINT_H
+#endif
+
 #include "abc_namespaces.h"
 
 ////////////////////////////////////////////////////////////////////////

cmake/modules/FindTBB.cmake

@@ -198,7 +198,7 @@ if(NOT TBB_FOUND)
   # Find TBB components
   ##################################
 
-  if(TBB_VERSION VERSION_LESS 4.3)
+  if(TBB_VERSION VERSION_LESS 4.3 AND NOT TBB_VERSION_MAJOR STREQUAL 2020)
     set(TBB_SEARCH_COMPOMPONENTS tbb_preview tbbmalloc tbb)
   else()
     set(TBB_SEARCH_COMPOMPONENTS tbb_preview tbbmalloc_proxy tbbmalloc tbb)

libs/EXTERNAL/libtatum/cmake/modules/FindTBB.cmake

@@ -198,7 +198,7 @@ if(NOT TBB_FOUND)
   # Find TBB components
   ##################################
 
-  if(TBB_VERSION VERSION_LESS 4.3)
+  if(TBB_VERSION VERSION_LESS 4.3 AND NOT TBB_VERSION_MAJOR STREQUAL 2020)
     set(TBB_SEARCH_COMPOMPONENTS tbb_preview tbbmalloc tbb)
   else()
     set(TBB_SEARCH_COMPOMPONENTS tbb_preview tbbmalloc_proxy tbbmalloc tbb)

libs/EXTERNAL/libtatum/libtatum/CMakeLists.txt

@@ -76,7 +76,7 @@ if (TATUM_USE_EXECUTION_ENGINE STREQUAL "tbb")
 
     target_compile_definitions(libtatum PUBLIC TATUM_USE_TBB)
     target_link_libraries(libtatum tbb)
-    target_link_libraries(libtatum tbbmalloc_proxy) #Use the scalable memory allocator
+    target_link_libraries(libtatum ${TBB_tbbmalloc_proxy_LIBRARY}) #Use the scalable memory allocator
 
 elseif (TATUM_USE_EXECUTION_ENGINE STREQUAL "serial")
     #Nothing to do

libs/libarchfpga/src/arch_check.cpp

@@ -1,4 +1,5 @@
 #include <set>
+#include <sstream>
 
 #include "vtr_log.h"
 #include "arch_error.h"

libs/libarchfpga/src/read_fpga_interchange_arch.cpp

@@ -8,6 +8,7 @@
 #include <string>
 #include <string.h>
 #include <zlib.h>
+#include <sstream>
 
 #include "vtr_assert.h"
 #include "vtr_digest.h"

libs/libvqm/vqm_common.c

@@ -35,7 +35,9 @@
 
 #include <assert.h>
 #include <stdio.h>
+#ifndef __APPLE__
 #include <malloc.h>
+#endif
 #include <string.h>
 #include <stdint.h>
 #include "vqm_dll.h"

libs/libvqm/vqm_dll.h

@@ -101,7 +101,9 @@
 
 
 #include <stdio.h>
+#ifndef __APPLE__
 #include <malloc.h>
+#endif
 
 
 /*****************************************************/

libs/libvqm/vqm_parser.y

@@ -21,7 +21,9 @@
 #include <stdlib.h>
 #include <stdint.h>
 //#include <crtdbg.h>
+#ifndef __APPLE__
 #include <malloc.h>
+#endif
 #include <string.h>
 #include <assert.h>
 #include "vqm_dll.h"

utils/vqm2blif/src/base/preprocess.h

@@ -27,7 +27,7 @@ typedef struct s_split_inout_pin {
 
 
 struct cmp_str {
-    bool operator()(char const* a, char const* b) {
+    bool operator()(char const* a, char const* b) const {
         return strcmp(a, b) < 0;
     }
 };

vpr/CMakeLists.txt

@@ -232,7 +232,7 @@ endif()
 if (VPR_USE_EXECUTION_ENGINE STREQUAL "tbb")
     target_compile_definitions(libvpr PRIVATE VPR_USE_TBB)
     target_link_libraries(libvpr tbb)
-    target_link_libraries(libvpr tbbmalloc_proxy) #Use the scalable memory allocator
+    target_link_libraries(libvpr ${TBB_tbbmalloc_proxy_LIBRARY}) #Use the scalable memory allocator
     message(STATUS "VPR: will support parallel execution using '${VPR_USE_EXECUTION_ENGINE}'")
 elseif(VPR_USE_EXECUTION_ENGINE STREQUAL "serial")
     message(STATUS "VPR: will only support serial execution")

vpr/src/base/read_interchange_netlist.cpp

@@ -15,6 +15,7 @@
 #include <unordered_set>
 #include <zlib.h>
 #include <iostream>
+#include <sstream>
 
 #include "LogicalNetlist.capnp.h"
 #include "capnp/serialize.h"