Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update llvm/clang to version 7.0.0 (release) #4353

Merged
merged 6 commits into from
Sep 20, 2018
Merged

Update llvm/clang to version 7.0.0 (release) #4353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
abc436f
Update llvm/clang to 7.0.0-svn342187 (release)
fwyzard Sep 19, 2018
7e5d3c4
Update IWYU to the current master
fwyzard Sep 19, 2018
fbd34bf
Disable automatic package dependencies
fwyzard May 29, 2018
2e201d0
Enable support for compiling CUDA code on amd64
fwyzard Jun 13, 2018
03addaf
Patch DXR to work with LLVM 7
smuzaffar Jun 18, 2018
ae11844
Skip numba and llvmlite until the latter supports LLVM 7
fwyzard Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions llvm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external llvm 6.0.0
### RPM external llvm 7.0.0
## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64
## INITENV +PATH PYTHON27PATH %{i}/lib64/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages
%define isamd64 %(case %{cmsplatf} in (*_amd64_*) echo 1 ;; (*) echo 0 ;; esac)
Expand All @@ -8,10 +8,11 @@ Requires: gcc zlib
%if %{isamd64}
Requires: cuda
%endif
AutoReq: no

%define llvmCommit 500cb56799157a08a3283a067f172b6c6ad4efa6
%define llvmBranch cms/release_60/329799
%define iwyuCommit 5082fddccb3d5aabaace2208f1162029a27c0334
%define llvmCommit ff0a5e8a591ed8bfc14320740863b357b1774f49
%define llvmBranch cms/release_70/342187
%define iwyuCommit 7b8980310f98ea76ac6d4e703d8bd07bde3d8ebc
%define iwyuBranch master

Source0: git+https://github.com/cms-externals/llvm-project-20170507.git?obj=%{llvmBranch}/%{llvmCommit}&export=llvm-%{realversion}-%{llvmCommit}&module=llvm-%{realversion}-%{llvmCommit}&output=/llvm-%{realversion}-%{llvmCommit}.tgz
Expand Down Expand Up @@ -46,7 +47,12 @@ cmake %{_builddir}/llvm-%{realversion}-%{llvmCommit}/llvm \
-DLLVM_ENABLE_EH:BOOL=ON \
-DLLVM_ENABLE_PIC:BOOL=ON \
-DLLVM_ENABLE_RTTI:BOOL=ON \
%if %{isamd64}
-DLLVM_TARGETS_TO_BUILD:STRING="X86;PowerPC;AArch64;NVPTX" \
-DLIBOMPTARGET_NVPTX_ALTERNATE_HOST_COMPILER=/usr/bin/gcc \
%else
-DLLVM_TARGETS_TO_BUILD:STRING="X86;PowerPC;AArch64" \
%endif
-DCMAKE_REQUIRED_INCLUDES="${ZLIB_ROOT}/include" \
-DCMAKE_PREFIX_PATH="${ZLIB_ROOT}"

Expand Down
13 changes: 13 additions & 0 deletions py2-dxr-clang700.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/dxr/plugins/clang/dxr-index.cpp b/dxr/plugins/clang/dxr-index.cpp
index 460d373..6b35340 100644
--- a/dxr/plugins/clang/dxr-index.cpp
+++ b/dxr/plugins/clang/dxr-index.cpp
@@ -923,7 +923,7 @@ public:
if (sm.isMacroArgExpansion(loc))
loc = sm.getImmediateSpellingLoc(loc);
else
- loc = sm.getImmediateExpansionRange(loc).first;
+ loc = sm.getImmediateExpansionRange(loc).getBegin();
}
return loc;
}
2 changes: 2 additions & 0 deletions py2-dxr.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Patch2: py2-dxr-fix-clang-linker-flags
Patch3: py2-dxr-clang36
Patch4: py2-dxr-sqlite38
Patch5: py2-dxr-clang37
Patch6: py2-dxr-clang700
%define keep_archives true

%prep
Expand All @@ -29,6 +30,7 @@ cd ..
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
mv trilite-%triliteCommit/* trilite
%setup -T -D -n dxr-%dxrCommit

Expand Down
4 changes: 2 additions & 2 deletions python_tools.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ Requires: py2-bottleneck
Requires: py2-downhill
Requires: py2-theanets
Requires: py2-xgboost
Requires: py2-llvmlite
Requires: py2-numba
#Requires: py2-llvmlite
#Requires: py2-numba
Requires: py2-hep_ml
Requires: py2-rep
Requires: py2-uncertainties
Expand Down