Skip to content

C
chromebrew
Commit 1ebd92ce authored by satmandu's avatar satmandu Committed by GitHub
Browse files
Options

llvm -> 11.1.0 Final (#5170)

parent 5e451f42
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 50 deletions
packages/llvm.rb
View file @ 1ebd92ce
...@@ -3,47 +3,41 @@ require 'package' ...@@ -3,47 +3,41 @@ require 'package'
class Llvm < Package class Llvm < Package
description 'The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. The optional packages clang, lld, lldb, polly, compiler-rt, libcxx, libcxxabi, and openmp are included.' description 'The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. The optional packages clang, lld, lldb, polly, compiler-rt, libcxx, libcxxabi, and openmp are included.'
homepage 'http://llvm.org/' homepage 'http://llvm.org/'
@_ver = '11.1.0-rc1' @_ver = '11.1.0'
version @_ver version @_ver
compatibility 'all' compatibility 'all'
source_url "https://github.com/llvm/llvm-project/archive/llvmorg-#{@_ver}.tar.gz" source_url "https://github.com/llvm/llvm-project/archive/llvmorg-#{@_ver}.tar.gz"
source_sha256 'e610297041129a5c5b24355a988c99c7452ee7105ee2355334a8c521b988eb3c' source_sha256 '53a0719f3f4b0388013cfffd7b10c7d5682eece1929a9553c722348d1f866e79'
binary_url ({ binary_url({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/llvm-11.1.0-rc1-chromeos-armv7l.tar.xz', aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/llvm-11.1.0-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/llvm-11.1.0-rc1-chromeos-armv7l.tar.xz', armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/llvm-11.1.0-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/llvm-11.1.0-rc1-chromeos-i686.tar.xz', i686: 'https://dl.bintray.com/chromebrew/chromebrew/llvm-11.1.0-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/llvm-11.1.0-rc1-chromeos-x86_64.tar.xz', x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/llvm-11.1.0-chromeos-x86_64.tar.xz'
}) })
binary_sha256 ({ binary_sha256({
aarch64: '5ecb72e60483b15c7588446a7ac424d64cdd3f21ca0fa5ffea4737a25dedca89', aarch64: 'ba0520a8d5bfa90efb3eb13a530c8d4052f9e7572aa30dd42dfc624b88a0251e',
armv7l: '5ecb72e60483b15c7588446a7ac424d64cdd3f21ca0fa5ffea4737a25dedca89', armv7l: 'ba0520a8d5bfa90efb3eb13a530c8d4052f9e7572aa30dd42dfc624b88a0251e',
i686: '5595ca097aa454bd54b8a336d467ee266f8afd4bd8100d1a3831e3face9b4f43', i686: '3a514f96c846d777c838fef6c585d2278abf2a586bfaeacfd3e2bccc9ffce838',
x86_64: '031f6f3510ebbc5a1270fac07934d7efa9126c8e89f98695505b1376d6d233a5', x86_64: '5b9e01c2411ea174293fc1d33b2dbf91f7001eb3cc3eda2e849b80f6f0dcb3c8'
}) })
# llvm_stage1 is compiled with gcc, without -flto
# Then in stage 2 (llvm.rb) everything is compiled with clang built in stage 1, with -flto=thin
# FYI LLVM 11.1.0 is a tiny rebuild of 11.0.1 fixing ABI compatibility with LLVM 10.0.0 & LLVM 12
depends_on 'ocaml' => :build depends_on 'ocaml' => :build
depends_on 'libedit'
depends_on 'libtirpc'
depends_on 'swig'
depends_on 'pygments' => :build depends_on 'pygments' => :build
depends_on 'ccache' => :build depends_on 'ccache' => :build
depends_on 'llvm_stage1' => :build # depends_on 'llvm_stage1' => :build # Not needed with a functional
depends_on 'binutils' => :build # prior llvm 11 build.
case ARCH case ARCH
when 'aarch64','armv7l' when 'aarch64', 'armv7l'
#LLVM_TARGETS_TO_BUILD = 'ARM;AArch64;AMDGPU' # LLVM_TARGETS_TO_BUILD = 'ARM;AArch64;AMDGPU'
LLVM_TARGETS_TO_BUILD = 'all' LLVM_TARGETS_TO_BUILD = 'all'.freeze
@ARCH_C_FLAGS = "-fPIC -march=armv7-a -mfloat-abi=hard -ccc-gcc-name #{CREW_BUILD}" @ARCH_C_FLAGS = "-fPIC -march=armv7-a -mfloat-abi=hard -ccc-gcc-name #{CREW_BUILD}"
@ARCH_CXX_FLAGS = "-fPIC -march=armv7-a -mfloat-abi=hard -ccc-gcc-name #{CREW_BUILD}" @ARCH_CXX_FLAGS = "-fPIC -march=armv7-a -mfloat-abi=hard -ccc-gcc-name #{CREW_BUILD}"
@ARCH_LDFLAGS = '' @ARCH_LDFLAGS = ''
@ARCH_LTO_LDFLAGS = "#{@ARCH_LDFLAGS} -flto=thin"
when 'i686' when 'i686'
LLVM_TARGETS_TO_BUILD = 'X86' LLVM_TARGETS_TO_BUILD = 'X86'.freeze
# Because ld.lld: error: undefined symbol: __atomic_store # Because ld.lld: error: undefined symbol: __atomic_store
# Polly demands fPIC # Polly demands fPIC
@ARCH_C_FLAGS = '-latomic -fPIC' @ARCH_C_FLAGS = '-latomic -fPIC'
...@@ -51,30 +45,32 @@ class Llvm < Package ...@@ -51,30 +45,32 @@ class Llvm < Package
# Because getting this error: # Because getting this error:
# ld.lld: error: relocation R_386_PC32 cannot be used against symbol isl_map_fix_si; recompile with -fPIC # ld.lld: error: relocation R_386_PC32 cannot be used against symbol isl_map_fix_si; recompile with -fPIC
# So as per https://github.com/openssl/openssl/issues/11305#issuecomment-602003528 # So as per https://github.com/openssl/openssl/issues/11305#issuecomment-602003528
@ARCH_LDFLAGS='-Wl,-znotext' @ARCH_LDFLAGS = '-Wl,-znotext'
@ARCH_LTO_LDFLAGS = "#{@ARCH_LDFLAGS} -flto=thin"
when 'x86_64' when 'x86_64'
#LLVM_TARGETS_TO_BUILD = 'X86;AMDGPU' # LLVM_TARGETS_TO_BUILD = 'X86;AMDGPU'
LLVM_TARGETS_TO_BUILD = 'all' LLVM_TARGETS_TO_BUILD = 'all'.freeze
@ARCH_C_FLAGS = '-fPIC' @ARCH_C_FLAGS = '-fPIC'
@ARCH_CXX_FLAGS = '-fPIC' @ARCH_CXX_FLAGS = '-fPIC'
@ARCH_LDFLAGS = '' @ARCH_LDFLAGS = ''
@ARCH_LTO_LDFLAGS = "#{@ARCH_LDFLAGS} -flto=thin"
end end
@ARCH_C_LTO_FLAGS = "#{@ARCH_C_FLAGS} -flto=thin -fuse-ld=lld" @ARCH_C_LTO_FLAGS = "#{@ARCH_C_FLAGS} -flto=thin -fuse-ld=lld"
@ARCH_CXX_LTO_FLAGS = "#{@ARCH_CXX_FLAGS} -flto=thin -fuse-ld=lld" @ARCH_CXX_LTO_FLAGS = "#{@ARCH_CXX_FLAGS} -flto=thin -fuse-ld=lld"
LLVM_PROJECTS_TO_BUILD = 'clang;clang-tools-extra;libcxx;libcxxabi;libunwind;lldb;compiler-rt;lld;polly;openmp' LLVM_PROJECTS_TO_BUILD = 'clang;clang-tools-extra;libcxx;libcxxabi;libunwind;lldb;compiler-rt;lld;polly;openmp'.freeze
# Using Targets 'all' for non-i686 because otherwise mesa complains. # Using Targets 'all' for non-i686 because otherwise mesa complains.
# This may be patched upstream as per # This may be patched upstream as per
# https://reviews.llvm.org/rG1de56d6d13c083c996dfd44a32041dacae037d66 # https://reviews.llvm.org/rG1de56d6d13c083c996dfd44a32041dacae037d66
#LLVM_TARGETS_TO_BUILD = 'all' # LLVM_TARGETS_TO_BUILD = 'all'
def self.patch def self.patch
# This keeps system libraries from being linked in as dependencies on a build host image, such as in docker. # This keeps system libraries from being linked in as dependencies on a build host image, such as in docker.
# Uncomment the rest of this section if you need to. # Uncomment the rest of this section if you need to.
#system "sudo rm /lib#{CREW_LIB_SUFFIX}/libncurses.so.5 || true" # system "sudo rm /lib#{CREW_LIB_SUFFIX}/libncurses.so.5 || true"
#system "sudo rm /usr/lib#{CREW_LIB_SUFFIX}/libform.so || true" # system "sudo rm /usr/lib#{CREW_LIB_SUFFIX}/libform.so || true"
#system "sudo ln -s #{CREW_LIB_PREFIX}/libncurses.so.6 /lib#{CREW_LIB_SUFFIX}/libncurses.so.5 || true" # system "sudo ln -s #{CREW_LIB_PREFIX}/libncurses.so.6 /lib#{CREW_LIB_SUFFIX}/libncurses.so.5 || true"
#system "sudo ln -s #{CREW_LIB_PREFIX}/libform.so /usr/lib#{CREW_LIB_SUFFIX}/libform.so || true" # system "sudo ln -s #{CREW_LIB_PREFIX}/libform.so /usr/lib#{CREW_LIB_SUFFIX}/libform.so || true"
end end
def self.build def self.build
...@@ -83,17 +79,17 @@ class Llvm < Package ...@@ -83,17 +79,17 @@ class Llvm < Package
puts "Building LLVM Projects: #{LLVM_PROJECTS_TO_BUILD}".lightgreen puts "Building LLVM Projects: #{LLVM_PROJECTS_TO_BUILD}".lightgreen
############################################################ ############################################################
############################################################ ############################################################
puts "Setting compile to use python3".lightgreen puts 'Setting compile to use python3'.lightgreen
############################################################ ############################################################
system "grep -rl '#!.*python' | xargs sed -i '1s/python$/python3/'" system "grep -rl '#!.*python' | xargs sed -i '1s/python$/python3/'"
############################################################ ############################################################
# puts "Downloading binutils #{BINUTILS_BRANCH} src to enable gold plugin build".lightgreen # puts "Downloading binutils #{BINUTILS_BRANCH} src to enable gold plugin build".lightgreen
############################################################ ############################################################
# system "git config --global advice.detachedHead false" # system "git config --global advice.detachedHead false"
# As per https://github.com/SVF-tools/SVF/wiki/Install-LLVM-Gold-Plugin-on-Ubuntu # As per https://github.com/SVF-tools/SVF/wiki/Install-LLVM-Gold-Plugin-on-Ubuntu
# system "git clone --depth 1 --branch #{BINUTILS_BRANCH} git://sourceware.org/git/binutils-gdb.git binutils" # system "git clone --depth 1 --branch #{BINUTILS_BRANCH} git://sourceware.org/git/binutils-gdb.git binutils"
Dir.mkdir 'builddir' Dir.mkdir 'builddir'
Dir.chdir 'builddir' do Dir.chdir 'builddir' do
system "echo '#!/bin/bash system "echo '#!/bin/bash
...@@ -108,7 +104,7 @@ cxx_sys=#{CREW_PREFIX}/include/c++/\${version} ...@@ -108,7 +104,7 @@ cxx_sys=#{CREW_PREFIX}/include/c++/\${version}
cxx_inc=#{CREW_PREFIX}/include/c++/\${version}/\${machine} cxx_inc=#{CREW_PREFIX}/include/c++/\${version}/\${machine}
gnuc_lib=#{CREW_LIB_PREFIX}/gcc/\${machine}/\${version} gnuc_lib=#{CREW_LIB_PREFIX}/gcc/\${machine}/\${version}
clang++ -fPIC -rtlib=compiler-rt -stdlib=libc++ -cxx-isystem \${cxx_sys} -I \${cxx_inc} -B \${gnuc_lib} -L \${gnuc_lib} \"\$@\"' > clc++" clang++ -fPIC -rtlib=compiler-rt -stdlib=libc++ -cxx-isystem \${cxx_sys} -I \${cxx_inc} -B \${gnuc_lib} -L \${gnuc_lib} \"\$@\"' > clc++"
system "env PATH=#{CREW_LIB_PREFIX}/ccache/bin:#{CREW_PREFIX}/bin:/usr/bin:/bin LD=ld.lld \ system "env PATH=#{CREW_LIB_PREFIX}/ccache/bin:#{CREW_PREFIX}/bin:/usr/bin:/bin LD=ld.lld \
cmake -G Ninja \ cmake -G Ninja \
-DLLVM_ENABLE_LTO=Thin \ -DLLVM_ENABLE_LTO=Thin \
-DCMAKE_C_COMPILER=$(which clang) \ -DCMAKE_C_COMPILER=$(which clang) \
...@@ -129,7 +125,7 @@ clang++ -fPIC -rtlib=compiler-rt -stdlib=libc++ -cxx-isystem \${cxx_sys} -I \${ ...@@ -129,7 +125,7 @@ clang++ -fPIC -rtlib=compiler-rt -stdlib=libc++ -cxx-isystem \${cxx_sys} -I \${
-DLLVM_ENABLE_RTTI=ON \ -DLLVM_ENABLE_RTTI=ON \
-DCMAKE_C_FLAGS='#{@ARCH_C_LTO_FLAGS}' \ -DCMAKE_C_FLAGS='#{@ARCH_C_LTO_FLAGS}' \
-DCMAKE_CXX_FLAGS='#{@ARCH_CXX_LTO_FLAGS}' \ -DCMAKE_CXX_FLAGS='#{@ARCH_CXX_LTO_FLAGS}' \
-DCMAKE_EXE_LINKER_FLAGS='#{@ARCH_LDFLAGS}' \ -DCMAKE_EXE_LINKER_FLAGS='#{@ARCH_LTO_LDFLAGS}' \
-DLLVM_PARALLEL_LINK_JOBS=1 \ -DLLVM_PARALLEL_LINK_JOBS=1 \
-DPYTHON_EXECUTABLE=$(which python3) \ -DPYTHON_EXECUTABLE=$(which python3) \
-DLLVM_INSTALL_UTILS=ON \ -DLLVM_INSTALL_UTILS=ON \
...@@ -152,20 +148,20 @@ clang++ -fPIC -rtlib=compiler-rt -stdlib=libc++ -cxx-isystem \${cxx_sys} -I \${ ...@@ -152,20 +148,20 @@ clang++ -fPIC -rtlib=compiler-rt -stdlib=libc++ -cxx-isystem \${cxx_sys} -I \${
end end
def self.install def self.install
Dir.chdir("builddir") do Dir.chdir('builddir') do
FileUtils.install 'clc', "#{CREW_DEST_PREFIX}/bin/clc", mode: 0755
FileUtils.install 'clc++', "#{CREW_DEST_PREFIX}/bin/clc++", mode: 0755
system "DESTDIR=#{CREW_DEST_DIR} ninja install" system "DESTDIR=#{CREW_DEST_DIR} ninja install"
FileUtils.install 'clc', "#{CREW_DEST_PREFIX}/bin/clc", mode: 0o755
FileUtils.install 'clc++', "#{CREW_DEST_PREFIX}/bin/clc++", mode: 0o755
FileUtils.mkdir_p "#{CREW_DEST_LIB_PREFIX}/bfd-plugins" FileUtils.mkdir_p "#{CREW_DEST_LIB_PREFIX}/bfd-plugins"
FileUtils.ln_s "lib#{CREW_LIB_SUFFIX}/LLVMgold.so", "#{CREW_DEST_LIB_PREFIX}/bfd-plugins/" FileUtils.ln_s "lib#{CREW_LIB_SUFFIX}/LLVMgold.so", "#{CREW_DEST_LIB_PREFIX}/bfd-plugins/"
end end
end end
def self.check def self.check
Dir.chdir("builddir") do Dir.chdir('builddir') do
#system "ninja check-llvm || true" # system "ninja check-llvm || true"
#system "ninja check-clang || true" # system "ninja check-clang || true"
#system "ninja check-lld || true" # system "ninja check-lld || true"
end end
end end
...@@ -173,10 +169,10 @@ clang++ -fPIC -rtlib=compiler-rt -stdlib=libc++ -cxx-isystem \${cxx_sys} -I \${ ...@@ -173,10 +169,10 @@ clang++ -fPIC -rtlib=compiler-rt -stdlib=libc++ -cxx-isystem \${cxx_sys} -I \${
puts puts
puts "To compile programs, use 'clang' or 'clang++'.".lightblue puts "To compile programs, use 'clang' or 'clang++'.".lightblue
puts puts
puts "To avoid the repeated use of switch options,".lightblue puts 'To avoid the repeated use of switch options,'.lightblue
puts "try the wrapper scripts 'clc' or 'clc++'.".lightblue puts "try the wrapper scripts 'clc' or 'clc++'.".lightblue
puts puts
puts "For more information, see http://llvm.org/pubs/2008-10-04-ACAT-LLVM-Intro.pdf".lightblue puts 'For more information, see http://llvm.org/pubs/2008-10-04-ACAT-LLVM-Intro.pdf'.lightblue
puts puts
end end
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7