[llvm-dev] 10.0.1-rc1 release has been tagged (original) (raw)

Tom Stellard via llvm-dev llvm-dev at lists.llvm.org
Wed May 20 14:12:40 PDT 2020

On 05/20/2020 09:53 AM, Sedat Dilek wrote:

On Wed, May 20, 2020 at 5:06 PM Tom Stellard <tstellar at redhat.com> wrote:

On 05/19/2020 09:05 PM, Sedat Dilek wrote: Hi Tom,

thanks and congrats for LLVM 10.0.1-rc1 release. [1] shows 2 assets. 10.0.0 RCs had a lot of more assets. I am missing the llvm-project-10.0.1rc1.tar.xz tarball. Will you provide them later or is there a new development/workflow decision I do not know of?

I've uploaded all the tarballs now. I have build from the below tarball. But the version-strings look odd.

You shouldn't have to make any changes to the source, did you try running the test-release.sh script?

-Tom

First I added...

--- llvm-project-10.0.1rc1/llvm/CMakeLists.txt 2020-05-19 21:16:37.000000000 +0200 +++ llvm-project/llvm/CMakeLists.txt 2020-05-20 18:02:42.443960091 +0200 @@ -25,7 +25,7 @@ if(NOT DEFINED LLVMVERSIONPATCH) set(LLVMVERSIONPATCH 1) endif() if(NOT DEFINED LLVMVERSIONSUFFIX) - set(LLVMVERSIONSUFFIX "") + set(LLVMVERSIONSUFFIX "rc1") endif() That lead to strange so-lib-names like *.so.10rc1 which is not wanted. I hacked around LLVMVERSIONSUFFIX stuff. Here is the diff: diff -uprN llvm-project-10.0.1rc1/clang/CMakeLists.txt llvm-project/clang/CMakeLists.txt --- llvm-project-10.0.1rc1/clang/CMakeLists.txt 2020-05-19 21:16:37.000000000 +0200 +++ llvm-project/clang/CMakeLists.txt 2020-05-20 18:36:57.621341162 +0200 @@ -358,8 +358,11 @@ endif() if(NOT DEFINED CLANGVERSIONPATCHLEVEL) set(CLANGVERSIONPATCHLEVEL ${LLVMVERSIONPATCH}) endif() -# Unlike PACKAGEVERSION, CLANGVERSION does not include LLVMVERSIONSUFFIX. -set(CLANGVERSION "${CLANGVERSIONMAJOR}.${CLANGVERSIONMINOR}.${CLANGVERSIONPATCHLEVEL}") +if(NOT DEFINED CLANGVERSIONSUFFIX) + set(CLANGVERSIONSUFFIX ${LLVMVERSIONSUFFIX}) +endif() +# Explicitly include CLANGVERSIONSUFFIX in CLANGVERSION. +set(CLANGVERSION "${CLANGVERSIONMAJOR}.${CLANGVERSIONMINOR}.${CLANGVERSIONPATCHLEVEL}${CLANGVERSIONSUFFIX}") message(STATUS "Clang version: ${CLANGVERSION}") # Configure the Version.inc file. @@ -687,6 +690,7 @@ if (CLANGENABLEBOOTSTRAP) CLANGVERSIONMINOR CLANGVERSIONPATCHLEVEL LLVMVERSIONSUFFIX + CLANGVERSIONSUFFIX LLVMBINUTILSINCDIR CLANGREPOSITORYSTRING CMAKECCOMPILERLAUNCHER Binärdateien llvm-project-10.0.1rc1/clang/test/Analysis/analyzertest.pyc und llvm-project/clang/test/Analysis/analyzertest.pyc sind verschieden. diff -uprN llvm-project-10.0.1rc1/lld/CMakeLists.txt llvm-project/lld/CMakeLists.txt --- llvm-project-10.0.1rc1/lld/CMakeLists.txt 2020-05-19 21:16:37.000000000 +0200 +++ llvm-project/lld/CMakeLists.txt 2020-05-20 18:40:07.817924825 +0200 @@ -120,16 +120,23 @@ set(LLDSOURCEDIR ${CMAKECURRENTSOURC set(LLDINCLUDEDIR ${LLDSOURCEDIR}/include ) set(LLDBINARYDIR ${CMAKECURRENTBINARYDIR}) -# Compute the LLD version from the LLVM version. -string(REGEX MATCH "[0-9]+\.[0-9]+(\.[0-9]+)?" LLDVERSION - ${PACKAGEVERSION}) +# If LLDVERSION* is specified, use it, if not use LLVMVERSION*. +if(NOT DEFINED LLDVERSIONMAJOR) + set(LLDVERSIONMAJOR ${LLVMVERSIONMAJOR}) +endif() +if(NOT DEFINED LLDVERSIONMINOR) + set(LLDVERSIONMINOR ${LLVMVERSIONMINOR}) +endif() +if(NOT DEFINED LLDVERSIONPATCHLEVEL) + set(LLDVERSIONPATCHLEVEL ${LLVMVERSIONPATCH}) +endif() +if(NOT DEFINED LLDVERSIONSUFFIX) + set(LLDVERSIONSUFFIX ${LLVMVERSIONSUFFIX}) +endif() +# Explicitly include LLDVERSIONSUFFIX in LLDVERSION. +set(LLDVERSION "${LLDVERSIONMAJOR}.${LLDVERSIONMINOR}.${LLDVERSIONPATCHLEVEL}${LLDVERSIONSUFFIX}") message(STATUS "LLD version: ${LLDVERSION}") -string(REGEX REPLACE "([0-9]+)\.[0-9]+(\.[0-9]+)?" "\1" LLDVERSIONMAJOR - ${LLDVERSION}) -string(REGEX REPLACE "[0-9]+\.([0-9]+)(\.[0-9]+)?" "\1" LLDVERSIONMINOR - ${LLDVERSION}) - # Determine LLD revision and repository. # TODO: Figure out a way to get the revision and the repository on windows. if ( NOT CMAKESYSTEMNAME MATCHES "Windows" ) diff -uprN llvm-project-10.0.1rc1/llvm/cmake/modules/AddLLVM.cmake llvm-project/llvm/cmake/modules/AddLLVM.cmake --- llvm-project-10.0.1rc1/llvm/cmake/modules/AddLLVM.cmake 2020-05-19 21:16:37.000000000 +0200 +++ llvm-project/llvm/cmake/modules/AddLLVM.cmake 2020-05-20 18:29:09.272548995 +0200 @@ -544,8 +544,8 @@ function(llvmaddlibrary name) settargetproperties(${name} PROPERTIES # Since 4.0.0, the ABI version is indicated by the major version - SOVERSION LLVMVERSIONMAJOR{LLVMVERSIONMAJOR}LLVMVERSIONMAJOR{LLVMVERSIONSUFFIX} - VERSION LLVMVERSIONMAJOR{LLVMVERSIONMAJOR}LLVMVERSIONMAJOR{LLVMVERSIONSUFFIX}) + SOVERSION ${LLVMVERSIONMAJOR} + VERSION ${LLVMVERSIONMAJOR}) endif() endif() @@ -567,7 +567,7 @@ function(llvmaddlibrary name) if(${outputname} STREQUAL "outputname-NOTFOUND") set(outputname ${name}) endif() - set(libraryname ${outputname}-${LLVMVERSIONMAJOR}${LLVMVERSIONSUFFIX}) + set(libraryname outputname−{outputname}-outputname−{LLVMVERSIONMAJOR}) set(apiname ${outputname}-${LLVMVERSIONMAJOR}.${LLVMVERSIONMINOR}.${LLVMVERSIONPATCH}${LLVMVERSIONSUFFIX}) settargetproperties(${name} PROPERTIES OUTPUTNAME ${libraryname}) llvminstalllibrarysymlink(${apiname} ${libraryname} SHARED diff -uprN llvm-project-10.0.1rc1/llvm/CMakeLists.txt llvm-project/llvm/CMakeLists.txt --- llvm-project-10.0.1rc1/llvm/CMakeLists.txt 2020-05-19 21:16:37.000000000 +0200 +++ llvm-project/llvm/CMakeLists.txt 2020-05-20 18:02:42.443960091 +0200 @@ -25,7 +25,7 @@ if(NOT DEFINED LLVMVERSIONPATCH) set(LLVMVERSIONPATCH 1) endif() if(NOT DEFINED LLVMVERSIONSUFFIX) - set(LLVMVERSIONSUFFIX "") + set(LLVMVERSIONSUFFIX "rc1") endif() if (NOT PACKAGEVERSION) diff -uprN llvm-project-10.0.1rc1/llvm/tools/llvm-config/CMakeLists.txt llvm-project/llvm/tools/llvm-config/CMakeLists.txt --- llvm-project-10.0.1rc1/llvm/tools/llvm-config/CMakeLists.txt 2020-05-19 21:16:37.000000000 +0200 +++ llvm-project/llvm/tools/llvm-config/CMakeLists.txt 2020-05-20 18:28:03.793999462 +0200 @@ -49,7 +49,7 @@ set(LLVMCFLAGS "${LLVMCSTDFLAG} ${LL set(LLVMCXXFLAGS "${CMAKECXX${CMAKECXXSTANDARD}STANDARDCOMPILEOPTION} ${LLVMCXXSTDLIBFLAG} COMPILEFLAGS{COMPILEFLAGS} COMPILEFLAGS{LLVMDEFINITIONS}") set(LLVMBUILDSYSTEM cmake) set(LLVMHASRTTI ${LLVMCONFIGHASRTTI}) -set(LLVMDYLIBVERSION "${LLVMVERSIONMAJOR}${LLVMVERSIONSUFFIX}") +set(LLVMDYLIBVERSION "${LLVMVERSIONMAJOR}") set(LLVMHASGLOBALISEL "ON") # Use the C++ link flags, since they should be a superset of C link flags. - End Of DIFF - With this I now get: $ ./bin/clang-10 -v ClangBuiltLinux clang version 10.0.1rc1 Target: x8664-unknown-linux-gnu Thread model: posix InstalledDir: /home/dileks/src/llvm-toolchain/build/stage1/./bin Found candidate GCC installation: /usr/lib/gcc/x8664-linux-gnu/10 Found candidate GCC installation: /usr/lib/gcc/x8664-linux-gnu/8 Found candidate GCC installation: /usr/lib/gcc/x8664-linux-gnu/9 Selected GCC installation: /usr/lib/gcc/x8664-linux-gnu/10 Candidate multilib: .;@m64 Candidate multilib: 32;@m32 Candidate multilib: x32;@mx32 Selected multilib: .;@m64 $ ./bin/ld.lld -v LLD 10.0.1rc1 (compatible with GNU linkers) $ find ./ -name '.so' | sort ./lib/BugpointPasses.so ./lib/libclang-cpp.so ./lib/libclang-cpp.so.10 ./lib/libclang.so ./lib/libclang.so.10 ./lib/libLTO.so ./lib/libLTO.so.10 ./lib/libRemarks.so ./lib/libRemarks.so.10 ./lib/LLVMgold.so ./lib/LLVMHello.so Looks that sane to you? Regards, - Sedat - [1] https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1-rc1/llvm-project-10.0.1rc1.tar.xz

-Tom

BTW, the source zip and tar.gz tarballs show no sizes. I am using Mobile LTE/UMTS to download stuff from the Internet.

For now I used the "llvmorg-10.0.1-rc1" Git tag to build my llvm-toolchain on Debian/testin8g AMD64. Thanks. Regards, - Sedat - [1] https://github.com/llvm/llvm-project/releases/tag/llvmorg-10.0.1-rc1

More information about the llvm-dev mailing list