Switch default branch for LLVM and CIRCT from master to main

tzik · tzik · commit 1e6ad3e02e90 · 2021-01-16T14:45:07.000+09:00
diff --git a/pkg/circt/etc/patches/deps_fix.patch b/pkg/circt/etc/patches/deps_fix.patch
diff --git a/pkg/circt/etc/patches/fix_deps.patch b/pkg/circt/etc/patches/fix_deps.patch
@@ -0,0 +1,10 @@
+diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt
+index b2c6875..73f7145 100644
+--- a/lib/Support/CMakeLists.txt
++++ b/lib/Support/CMakeLists.txt
+@@ -11,4 +11,5 @@ add_circt_library(CIRCTSupport
+   ADDITIONAL_HEADER_DIRS
+ 
+   LINK_LIBS PUBLIC
++  MLIRIR
+   )
diff --git a/pkg/circt/etc/patches/include_order.patch b/pkg/circt/etc/patches/include_order.patch
@@ -1,18 +1,23 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0f281ee..959d23f 100644
+index cbc4efa..53e8c19 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -82,11 +82,11 @@ add_custom_target(circt-headers)
+@@ -103,14 +103,14 @@ add_custom_target(circt-headers)
  set_target_properties(circt-headers PROPERTIES FOLDER "Misc")
  add_custom_target(circt-doc)
  
-+include_directories(${CIRCT_MAIN_SRC_DIR})
-+include_directories(${CIRCT_INCLUDE_DIR})
- include_directories(${LLVM_INCLUDE_DIRS})
- include_directories(${MLIR_INCLUDE_DIRS})
- #include_directories( ${MLIR_BINARY_INCLUDE_DIR})
--include_directories(${CIRCT_MAIN_SRC_DIR})
--include_directories(${CIRCT_INCLUDE_DIR})
+-# Add MLIR and LLVM headers to the include path
+-include_directories(${LLVM_INCLUDE_DIRS})
+-include_directories(${MLIR_INCLUDE_DIRS})
+-
+ # Add CIRCT files to the include path
+ include_directories(${CIRCT_MAIN_INCLUDE_DIR})
+ include_directories(${CIRCT_INCLUDE_DIR})
  
- # If Verilator hasn't been explicitly disabled, find it.
- option(VERILATOR_DISABLE "Disable the Verilator tests.")
++# Add MLIR and LLVM headers to the include path
++include_directories(${LLVM_INCLUDE_DIRS})
++include_directories(${MLIR_INCLUDE_DIRS})
++
+ #-------------------------------------------------------------------------------
+ # Verilator Configuration
+ #-------------------------------------------------------------------------------
diff --git a/pkg/circt/etc/patches/install_llhd-sim.patch b/pkg/circt/etc/patches/install_llhd-sim.patch
@@ -1,13 +1,13 @@
 diff --git a/tools/llhd-sim/CMakeLists.txt b/tools/llhd-sim/CMakeLists.txt
-index 46c695d..f29efdf 100644
+index f489812..01d7e48 100644
 --- a/tools/llhd-sim/CMakeLists.txt
 +++ b/tools/llhd-sim/CMakeLists.txt
-@@ -9,7 +9,7 @@ set(LIBS
-         CIRCTLLHDSimEngine
-         )
+@@ -11,7 +11,7 @@ set(LIBS
  
--add_llvm_executable(llhd-sim
-+add_llvm_tool(llhd-sim
-  llhd-sim.cpp)
-  
- llvm_update_compile_flags(llhd-sim)
+ # llhd-sim fails to link on Windows with MSVC.
+ IF(NOT WIN32)
+-  add_llvm_executable(llhd-sim
++  add_llvm_tool(llhd-sim
+     llhd-sim.cpp)
+   
+   llvm_update_compile_flags(llhd-sim)
diff --git a/pkg/circt/repo b/pkg/circt/repo
@@ -1 +1 @@
-src	https://github.com/llvm/circt.git	master	2228c690927039736493ab2551ed15d42c87badc
+src	https://github.com/llvm/circt.git	main	63603815318f4733c23a193c2ec08d791d058bcb
diff --git a/pkg/llvm/repo b/pkg/llvm/repo
@@ -1 +1 @@
-src	https://github.com/llvm/llvm-project.git	master	d9da4c3e73720badfcac5c0dc63c0285bb690770
+src	https://github.com/llvm/llvm-project.git	main	8f283cafddfa8d6d01a94b48cdc5d25817569e91

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-src https://github.com/llvm/circt.git master 2228c690927039736493ab2551ed15d42c87badc`
	`1`	`+src https://github.com/llvm/circt.git main 63603815318f4733c23a193c2ec08d791d058bcb`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-src https://github.com/llvm/llvm-project.git master d9da4c3e73720badfcac5c0dc63c0285bb690770`
	`1`	`+src https://github.com/llvm/llvm-project.git main 8f283cafddfa8d6d01a94b48cdc5d25817569e91`