[gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/files/, dev-lang/ispc/
commit: 362fd30287746e0e46d8a4aaa77fe6e5b4fb83ff Author: Michał Górny gentoo org> AuthorDate: Thu Jan 25 04:16:14 2024 + Commit: Michał Górny gentoo org> CommitDate: Thu Jan 25 04:43:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362fd302 dev-lang/ispc: Remove old Signed-off-by: Michał Górny gentoo.org> dev-lang/ispc/Manifest | 1 - dev-lang/ispc/files/ispc-1.19.0-curses-cmake.patch | 16 - dev-lang/ispc/files/ispc-1.19.0-gcc13.patch| 27 dev-lang/ispc/ispc-1.19.0.ebuild | 79 -- 4 files changed, 123 deletions(-) diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest index e712d186483d..b89a21202d58 100644 --- a/dev-lang/ispc/Manifest +++ b/dev-lang/ispc/Manifest @@ -1,2 +1 @@ -DIST ispc-1.19.0.tar.gz 19577782 BLAKE2B 5ad6b0bb27f2a27267a26a729693bd16250ae5e8740728290fe6ad85c7ecd4da40f316f2ca6b1447ff3a13f6949db4ed2af6ebf2c6ce6ba43620dfb1943d SHA512 140f16bc0f9e0a94853b50a5433be9196ee09b6c70a1840d400d0d201143da8cb2b1b92a857acf5856ed3410bfffd17678eb1029996f9007fe947f5ac78bf1bb DIST ispc-1.22.0.gh.tar.gz 19618494 BLAKE2B 0dae95d792e4d629b38a9775c2c600131374c69dfa086d6a67100e40e5005ef054b9a651f418e0452a19ee4e64ffd830bfaa787b14e706473e8fab1d2380f0fd SHA512 4436ea37003b4cbfefcbf4c18212d0e98536243ae8f01053817d579e04205a4dcd4ab7b2b282fec99fc617009fdbea340b348cf4a2134240d2fcfc6bcaf6b60c diff --git a/dev-lang/ispc/files/ispc-1.19.0-curses-cmake.patch b/dev-lang/ispc/files/ispc-1.19.0-curses-cmake.patch deleted file mode 100644 index 19a19e871ee7.. --- a/dev-lang/ispc/files/ispc-1.19.0-curses-cmake.patch +++ /dev/null @@ -1,16 +0,0 @@ a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -598,11 +598,8 @@ else() - target_link_libraries(${PROJECT_NAME} pthread tinfo.a curses.a) - else() - find_package(Curses REQUIRED) --if (CURSES_EXTRA_LIBRARY) --# this contains the tinfo library, if found --target_link_libraries(${PROJECT_NAME} ${CURSES_EXTRA_LIBRARY}) --endif() --target_link_libraries(${PROJECT_NAME} pthread ${CURSES_CURSES_LIBRARY}) -+set(CURSES_NEED_NCURSES ON) -+target_link_libraries(${PROJECT_NAME} pthread ${CURSES_LIBRARIES}) - endif() - endif() - diff --git a/dev-lang/ispc/files/ispc-1.19.0-gcc13.patch b/dev-lang/ispc/files/ispc-1.19.0-gcc13.patch deleted file mode 100644 index e2bae38ae581.. --- a/dev-lang/ispc/files/ispc-1.19.0-gcc13.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.gentoo.org/895572 -https://github.com/ispc/ispc/commit/ffc75e464ff2b8fce7dbf74f1846ebd0852bc6f9 - -From ffc75e464ff2b8fce7dbf74f1846ebd0852bc6f9 Mon Sep 17 00:00:00 2001 -From: Luya Tshimbalanga -Date: Tue, 28 Feb 2023 17:20:21 -0800 -Subject: [PATCH] Fix build with GCC 13 and possibly Clang 15 - -This fix add missing include to handle "uint32_t". a/src/target_registry.h -+++ b/src/target_registry.h -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2019-2021, Intel Corporation -+ Copyright (c) 2019-2023, Intel Corporation - All rights reserved. - - Redistribution and use in source and binary forms, with or without -@@ -40,6 +40,7 @@ - #include "bitcode_lib.h" - - #include -+#include - #include - #include - - diff --git a/dev-lang/ispc/ispc-1.19.0.ebuild b/dev-lang/ispc/ispc-1.19.0.ebuild deleted file mode 100644 index 42ebe7e712a4.. --- a/dev-lang/ispc/ispc-1.19.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -LLVM_MAX_SLOT=15 -inherit cmake python-any-r1 llvm - -DESCRIPTION="Intel SPMD Program Compiler" -HOMEPAGE="https://ispc.github.io/"; - -if [[ ${PV} == ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ispc/ispc.git"; -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" -fi - -LICENSE="BSD BSD-2 UoI-NCSA" -SLOT="0" -IUSE="examples test" -RESTRICT="!test? ( test )" - -RDEPEND="https://bugs.gentoo.org/730062 - ewarn "Removing auto-x86 build on amd64" - sed -i -e 's:set(target_arch "i686"):return():' cmake/GenerateBuiltins.cmake || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DARM_ENABLED=$(usex arm) - -DCMAKE_SKIP_RPATH=ON - -DISPC_INCLUDE_EXAMPLES=OFF - -DISPC_INCLUDE_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_test() { - # Inject path to prevent using system ispc - PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} ./run_tests.py || die "Testing failed under ${EPYTHON}" -} - -src_install() { - dobin "${BUILD_DIR}"/bin/ispc - einstalldocs - - if use examples; then - docompress -x /
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/files/, dev-lang/ispc/
commit: 8a91f68c7b24c9482f470ddfb4e04fe1cadefafe Author: Ionen Wolkens gentoo org> AuthorDate: Sun Jul 25 00:50:56 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Sun Jul 25 01:35:10 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a91f68c dev-lang/ispc: drop 1.14.1 Signed-off-by: Ionen Wolkens gentoo.org> dev-lang/ispc/Manifest | 1 - .../files/ispc-1.13.0-cmake-gentoo-release.patch | 13 --- dev-lang/ispc/files/ispc-1.13.0-werror.patch | 13 --- dev-lang/ispc/files/ispc-1.14.0-llvm-10.patch | 106 - dev-lang/ispc/ispc-1.14.1.ebuild | 82 5 files changed, 215 deletions(-) diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest index 30167e29bb8..e70729967c1 100644 --- a/dev-lang/ispc/Manifest +++ b/dev-lang/ispc/Manifest @@ -1,2 +1 @@ -DIST ispc-1.14.1.tar.gz 19454189 BLAKE2B 615698e64ffbd2c82808d6ddd0b5b90f7c52bb8c202a04364d63af26f0e062631f4a8ad01895c1a4f1a8f11e7f91aec381354ddd873d0a4f2908431dcaabe383 SHA512 468e8a44408047ba7b43dc4baf05c2659093b986e131ebe973954ff3b9cf707a4ed22c705b6e01a9abc9a3911669ab31cd191449442c4ac73112a1297da32c5e DIST ispc-1.16.0.tar.gz 19548153 BLAKE2B 9b6d9329430d59041a76c20332b527560afa47a5585652abdf93aedb7907483d1647c829f2bd3f396cd53301bc79367cd91606b90a543fa8bec2f6ab34452989 SHA512 8469db4e3e9834477345b431162543f1c8e680aa9834c9a50239781dc7febfdde0561c2f13d1387e37f95a18c4376a85cb9cbae33cb614dc8977dfc9f47da215 diff --git a/dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch b/dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch deleted file mode 100644 index b89e6150400..000 --- a/dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13e66268..27ff8364 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -137,7 +137,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin ) - - if(CMAKE_BUILD_TYPE) - # Validate build type --set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo") -+set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;Gentoo") - - string(FIND "${CONFIGURATION_TYPES}" "${CMAKE_BUILD_TYPE}" MATCHED_CONFIG) - if (${MATCHED_CONFIG} EQUAL -1) diff --git a/dev-lang/ispc/files/ispc-1.13.0-werror.patch b/dev-lang/ispc/files/ispc-1.13.0-werror.patch deleted file mode 100644 index 3fa144b78db..000 --- a/dev-lang/ispc/files/ispc-1.13.0-werror.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13e66268..27ff8364 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -352,7 +352,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE -${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}) - # Compile options - if (UNIX) --target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function -Werror ${LLVM_CPP_FLAGS}) -+target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function ${LLVM_CPP_FLAGS}) - # Security options - target_compile_options(${PROJECT_NAME} PRIVATE -fstack-protector -fdata-sections -ffunction-sections --Wformat -Wformat-security -fpie -fwrapv) diff --git a/dev-lang/ispc/files/ispc-1.14.0-llvm-10.patch b/dev-lang/ispc/files/ispc-1.14.0-llvm-10.patch deleted file mode 100644 index 7a76d99aca8..000 --- a/dev-lang/ispc/files/ispc-1.14.0-llvm-10.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13e66268..27ff8364 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -218,7 +218,7 @@ if (WASM_ENABLED) - list(APPEND ISPC_TARGETS wasm-i32x4) - endif() - --set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex) -+set(CLANG_LIBRARY_LIST clang clang-cpp) - set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option) - - if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "10.0.0") -@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN) - endif() - - # Link against Clang libraries --foreach(clangLib ${CLANG_LIBRARY_LIST}) --find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS}) --list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path}) --endforeach() --target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST}) -+find_package(Clang REQUIRED) -+target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST}) - - # Link against LLVM libraries - target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST}) -diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp -index 06fab989..57a7130f 100644 a/src/llvmutil.cpp -+++ b/src/llvmutil.cpp -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - #ifdef ISPC_GENX_ENABLED - #include -@@ -1394,7 +1395,7 @@ static void lDumpValue(llvm::Value *v,
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/files/, dev-lang/ispc/
commit: f40b8f3444f962cf41f8a8f677e5c3c6e8c9eacd Author: Ionen Wolkens gentoo org> AuthorDate: Fri Jun 11 11:04:11 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Fri Jun 11 11:06:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f40b8f34 dev-lang/ispc: remove upstreamed -Werror patch for live ebuild Closes: https://bugs.gentoo.org/795294 Signed-off-by: Ionen Wolkens gentoo.org> dev-lang/ispc/files/ispc--werror.patch | 13 - dev-lang/ispc/ispc-.ebuild | 1 - 2 files changed, 14 deletions(-) diff --git a/dev-lang/ispc/files/ispc--werror.patch b/dev-lang/ispc/files/ispc--werror.patch deleted file mode 100644 index 0e860a95de2..000 --- a/dev-lang/ispc/files/ispc--werror.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13e66268..27ff8364 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -352,7 +352,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE - set_source_files_properties(${FLEX_OUTPUT} PROPERTIES COMPILE_FLAGS "/wd4005 /wd4003") - set_source_files_properties(${BISON_OUTPUT} PROPERTIES COMPILE_FLAGS "/wd4005 /wd4065") - else() --target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function -Werror ${LLVM_CPP_FLAGS}) -+target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function ${LLVM_CPP_FLAGS}) - # The change implementing -Wno-unused-but-set-variable in clang was reverted, so commenting out for now. - #if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "13.0.0") - #set_source_files_properties(${BISON_CPP_OUTPUT} PROPERTIES COMPILE_FLAGS "-Wno-unused-but-set-variable") diff --git a/dev-lang/ispc/ispc-.ebuild b/dev-lang/ispc/ispc-.ebuild index 23b20156fd2..8cc95c5d749 100644 --- a/dev-lang/ispc/ispc-.ebuild +++ b/dev-lang/ispc/ispc-.ebuild @@ -37,7 +37,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-1.13.0-cmake-gentoo-release.patch" "${FILESDIR}/${PN}--llvm.patch" - "${FILESDIR}/${PN}--werror.patch" ) CMAKE_BUILD_TYPE="RelWithDebInfo"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/files/, dev-lang/ispc/
commit: 6d7f758287a022cd45049c37930d7ab5b4938526 Author: Sebastian Parborg gmail com> AuthorDate: Sat Sep 5 21:44:32 2020 + Commit: Sam James gentoo org> CommitDate: Thu Sep 10 00:42:13 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7f7582 dev-lang/ispc: Drop old 1.13.0 ebuild Signed-off-by: Sebastian Parborg gmail.com> Closes: https://github.com/gentoo/gentoo/pull/17282 Signed-off-by: Sam James gentoo.org> dev-lang/ispc/Manifest| 1 - dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch | 106 -- dev-lang/ispc/ispc-1.13.0.ebuild | 59 -- 3 files changed, 166 deletions(-) diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest index 886b57a17be..4572d984a64 100644 --- a/dev-lang/ispc/Manifest +++ b/dev-lang/ispc/Manifest @@ -1,2 +1 @@ -DIST ispc-1.13.0.tar.gz 19202295 BLAKE2B 5fae81429acbda0d65d33e56609d05fb8b5a7db6dd0af5ff779d1e8954f6a98d1fcb0f7ecf0c1b9813630026557c21c2a70bfc87ed75959a8bd24e06fcd2e351 SHA512 d23c127beb9bb17e1ad2509f9ad51dd660c473458b939a6b64ca7f6319b3c2f25318ea2ceac00e4100a059f3f67fb97b6973f18e3432c82ff9691f2a08d15d5d DIST ispc-1.14.0.tar.gz 19454030 BLAKE2B 3bd494f4357c7c756c6bc63c76ced37feb83e8f6f73b0adc9e432f37e905efe0f7fe5f8b153d3ccff3ac9f826d0c76f7c33f2a151887ab900088bab95e626856 SHA512 a1325a26804f08a357c84cb1d7266bd56d6d135314985337e057e39ddf556a7332922926e9d10db817048a8d5b491467de7261029a0a46726f330a00791ee8f8 diff --git a/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch b/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch deleted file mode 100644 index 6911a76d9e1..000 --- a/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13e66268..27ff8364 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -218,7 +218,7 @@ if (WASM_ENABLED) - list(APPEND ISPC_TARGETS wasm-i32x4) - endif() - --set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex) -+set(CLANG_LIBRARY_LIST clang clang-cpp) - set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option) - - if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "10.0.0") -@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN) - endif() - - # Link against Clang libraries --foreach(clangLib ${CLANG_LIBRARY_LIST}) --find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS}) --list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path}) --endforeach() --target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST}) -+find_package(Clang REQUIRED) -+target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST}) - - # Link against LLVM libraries - target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST}) -diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp -index 06fab989..57a7130f 100644 a/src/llvmutil.cpp -+++ b/src/llvmutil.cpp -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1394,7 +1395,7 @@ static void lDumpValue(llvm::Value *v, std::set &done) { - return; - - fprintf(stderr, " "); --v->dump(); -+v->print(llvm::outs(), false); - done.insert(v); - - if (inst == NULL) -diff --git a/src/opt.cpp b/src/opt.cpp -index d78ac374..a607594a 100644 a/src/opt.cpp -+++ b/src/opt.cpp -@@ -142,7 +142,7 @@ static llvm::Pass *CreateFixBooleanSelectPass(); - getenv("FUNC"), strlen(getenv("FUNC")) {\ - fprintf(stderr, "Start of " NAME "\n"); \ - fprintf(stderr, "---\n"); \ --bb.dump(); \ -+bb.print(llvm::outs(), false); \ - fprintf(stderr, "---\n\n"); \ - } else /* eat semicolon */ - -@@ -152,7 +152,7 @@ static llvm::Pass *CreateFixBooleanSelectPass(); - getenv("FUNC"), strlen(getenv("FUNC")) {\ - fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : ""); \ - fprintf(stderr, "---\n"); \ --bb.dump(); \ -+bb.print(llvm::outs(), false); \ - fprintf(stderr,
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/files/, dev-lang/ispc/
commit: 65348f0cb721bd7b1a16b44915ca70cfabcfc064 Author: Sebastian Parborg gmail com> AuthorDate: Sat Sep 5 21:41:48 2020 + Commit: Sam James gentoo org> CommitDate: Thu Sep 10 00:42:12 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65348f0c dev-lang/ispc: Version bump to 1.14.0 Signed-off-by: Sebastian Parborg gmail.com> Signed-off-by: Sam James gentoo.org> dev-lang/ispc/Manifest| 1 + dev-lang/ispc/files/ispc-1.14.0-llvm-10.patch | 106 ++ dev-lang/ispc/ispc-1.14.0.ebuild | 65 3 files changed, 172 insertions(+) diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest index b1de2c9d7ee..886b57a17be 100644 --- a/dev-lang/ispc/Manifest +++ b/dev-lang/ispc/Manifest @@ -1 +1,2 @@ DIST ispc-1.13.0.tar.gz 19202295 BLAKE2B 5fae81429acbda0d65d33e56609d05fb8b5a7db6dd0af5ff779d1e8954f6a98d1fcb0f7ecf0c1b9813630026557c21c2a70bfc87ed75959a8bd24e06fcd2e351 SHA512 d23c127beb9bb17e1ad2509f9ad51dd660c473458b939a6b64ca7f6319b3c2f25318ea2ceac00e4100a059f3f67fb97b6973f18e3432c82ff9691f2a08d15d5d +DIST ispc-1.14.0.tar.gz 19454030 BLAKE2B 3bd494f4357c7c756c6bc63c76ced37feb83e8f6f73b0adc9e432f37e905efe0f7fe5f8b153d3ccff3ac9f826d0c76f7c33f2a151887ab900088bab95e626856 SHA512 a1325a26804f08a357c84cb1d7266bd56d6d135314985337e057e39ddf556a7332922926e9d10db817048a8d5b491467de7261029a0a46726f330a00791ee8f8 diff --git a/dev-lang/ispc/files/ispc-1.14.0-llvm-10.patch b/dev-lang/ispc/files/ispc-1.14.0-llvm-10.patch new file mode 100644 index 000..7a76d99aca8 --- /dev/null +++ b/dev-lang/ispc/files/ispc-1.14.0-llvm-10.patch @@ -0,0 +1,106 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13e66268..27ff8364 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -218,7 +218,7 @@ if (WASM_ENABLED) + list(APPEND ISPC_TARGETS wasm-i32x4) + endif() + +-set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex) ++set(CLANG_LIBRARY_LIST clang clang-cpp) + set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option) + + if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "10.0.0") +@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN) + endif() + + # Link against Clang libraries +-foreach(clangLib ${CLANG_LIBRARY_LIST}) +-find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS}) +-list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path}) +-endforeach() +-target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST}) ++find_package(Clang REQUIRED) ++target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST}) + + # Link against LLVM libraries + target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST}) +diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp +index 06fab989..57a7130f 100644 +--- a/src/llvmutil.cpp b/src/llvmutil.cpp +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + #ifdef ISPC_GENX_ENABLED + #include +@@ -1394,7 +1395,7 @@ static void lDumpValue(llvm::Value *v, std::set &done) { + return; + + fprintf(stderr, " "); +-v->dump(); ++v->print(llvm::outs(), false); + done.insert(v); + + if (inst == NULL) +diff --git a/src/opt.cpp b/src/opt.cpp +index d78ac374..a607594a 100644 +--- a/src/opt.cpp b/src/opt.cpp +@@ -142,7 +142,7 @@ static llvm::Pass *CreateFixBooleanSelectPass(); + getenv("FUNC"), strlen(getenv("FUNC")) {\ + fprintf(stderr, "Start of " NAME "\n"); \ + fprintf(stderr, "---\n"); \ +-bb.dump(); \ ++bb.print(llvm::outs(), false); \ + fprintf(stderr, "---\n\n"); \ + } else /* eat semicolon */ + +@@ -152,7 +152,7 @@ static llvm::Pass *CreateFixBooleanSelectPass(); + getenv("FUNC"), strlen(getenv("FUNC")) {\ + fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : ""); \ + fprintf(stderr, "---\n"); \ +-bb.dump(); \ ++bb.print(llvm::outs(), false); \ + fprintf(stderr, "---\n\n");