Merge pull request #5949 from YosysHQ/update_abc

MSVC full build
This commit is contained in:
Miodrag Milanović 2026-06-09 16:28:00 +00:00 committed by GitHub
commit 7b40b7a6f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 2 deletions

View File

@ -59,7 +59,6 @@ jobs:
cmake -S . -B build
-A x64
-DCMAKE_BUILD_TYPE=Release
-DYOSYS_WITHOUT_ABC=ON
- name: Build
run: >

2
abc

@ -1 +1 @@
Subproject commit 3df13d9aad89374854c55a27e8db10141397c973
Subproject commit 1e85fff18db313b29584dc1ff7c2074d2275a381

View File

@ -61,8 +61,16 @@ function(yosys_abc_target arg_LIBNAME arg_EXENAME)
ABC_NO_DYNAMIC_LINKING
$<${YOSYS_ENABLE_THREADS}:ABC_USE_PTHREADS>
$<${YOSYS_ENABLE_READLINE}:ABC_USE_READLINE>
$<$<CXX_COMPILER_ID:MSVC>:ABC_USE_PTHREADS>
$<$<CXX_COMPILER_ID:MSVC>:_WINSOCKAPI_>
$<$<CXX_COMPILER_ID:MSVC>:HAVE_STRUCT_TIMESPEC>
ABC_NO_RLIMIT
)
target_compile_options(${arg_LIBNAME} PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/wd4576>
$<$<CXX_COMPILER_ID:MSVC>:/Zc:strictStrings->
)
target_safe_compile_options(${arg_LIBNAME} PRIVATE
-fpermissive
-fno-exceptions
@ -78,10 +86,14 @@ function(yosys_abc_target arg_LIBNAME arg_EXENAME)
$<${YOSYS_ENABLE_THREADS}:Threads::Threads>
$<${YOSYS_ENABLE_READLINE}:PkgConfig::readline>
$<$<BOOL:${WIN32}>:-lshlwapi>
$<$<CXX_COMPILER_ID:MSVC>:${CMAKE_SOURCE_DIR}/abc/lib/x64/pthreadVC2.lib>
)
set_target_properties(${arg_LIBNAME} PROPERTIES
YOSYS_IS_ABC ON
)
if(MSVC)
install(FILES "${CMAKE_SOURCE_DIR}/abc/lib/x64/pthreadVC2.dll" DESTINATION bin)
endif()
yosys_cxx_executable(${arg_EXENAME}
OUTPUT_NAME ${arg_EXENAME}