proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2026-02-01 16:44:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '7' of salsa.debian.org:pkg-llvm-team/llvm-toolchain into 7

Browse Source
This commit is contained in:
Sylvestre Ledru 2018-11-11 20:56:48 +01:00
commit 6dcf387d9a
5 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -1,6 +1,10 @@
llvm-toolchain-7 (1:7.0.1~+rc2-3) unstable; urgency=medium
* Disable gold for sparc* (Closes: #913260)
* Hide a symbol in openmp for mips64el
* Try to integrate a pach to make pch reproducible
Thanks to Rebecca Palmer for the patch
(Closes: #877359)
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 08 Nov 2018 20:50:39 +0100

4
debian/libomp5-X.Y.symbols.in vendored
View File

@ -862,7 +862,7 @@ libomp.so.5 libomp5 #MINVER#
kmp_get_stacksize_s_@VERSION 0.20130412
kmp_malloc@VERSION 0.20130412
kmp_malloc_@VERSION 0.20130412
kmp_mutex_impl_info@VERSION 7
(arch=!mips64el)kmp_mutex_impl_info@VERSION 7
kmp_realloc@VERSION 0.20130412
kmp_realloc_@VERSION 0.20130412
kmp_set_affinity@VERSION 0.20130412
@ -1095,7 +1095,7 @@ libomp.so.5 libomp5 #MINVER#
omp_set_schedule@VERSION 0.20130412
omp_set_schedule_@OMP_3.0 0.20131209
omp_set_schedule_@VERSION 0.20130412
(arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf) omp_state_info@VERSION 6.0
(arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)omp_state_info@VERSION 6.0
omp_test_lock@OMP_1.0 0.20131209
omp_test_lock@OMP_3.0 0.20131209
omp_test_lock@VERSION 0.20130412

40
debian/patches/reproducible-pch.diff vendored Normal file
View File

@ -0,0 +1,40 @@
Description: Make ordering of OPENCL_EXTENSION_TYPES reproducible
Author: Rebecca N. Palmer <rebecca_palmer@zoho.com>
Bug-Debian: https://bugs.debian.org/877359
Forwarded: no
Index: llvm-toolchain-7-7/clang/lib/Serialization/ASTWriter.cpp
===================================================================
--- llvm-toolchain-7-7.orig/clang/lib/Serialization/ASTWriter.cpp
+++ llvm-toolchain-7-7/clang/lib/Serialization/ASTWriter.cpp
@@ -4293,9 +4293,13 @@ void ASTWriter::WriteOpenCLExtensionType
return;
RecordData Record;
+ // Sort to allow reproducible .pch files - https://bugs.debian.org/877359
+ std::map<TypeID, std::set<std::string>> sortedOpenCLTypeExtMap;
for (const auto &I : SemaRef.OpenCLTypeExtMap) {
- Record.push_back(
- static_cast<unsigned>(getTypeID(I.first->getCanonicalTypeInternal())));
+ sortedOpenCLTypeExtMap[getTypeID(I.first->getCanonicalTypeInternal())]=I.second;
+ }
+ for (const auto &I : sortedOpenCLTypeExtMap) {
+ Record.push_back(static_cast<unsigned>(I.first));
Record.push_back(I.second.size());
for (auto Ext : I.second)
AddString(Ext, Record);
@@ -4308,8 +4312,12 @@ void ASTWriter::WriteOpenCLExtensionDecl
return;
RecordData Record;
+ std::map<DeclID, std::set<std::string>> sortedOpenCLDeclExtMap;
for (const auto &I : SemaRef.OpenCLDeclExtMap) {
- Record.push_back(getDeclID(I.first));
+ sortedOpenCLDeclExtMap[getDeclID(I.first)]=I.second;
+ }
+ for (const auto &I : sortedOpenCLDeclExtMap) {
+ Record.push_back(I.first);
Record.push_back(static_cast<unsigned>(I.second.size()));
for (auto Ext : I.second)
AddString(Ext, Record);

1
debian/patches/series vendored
View File

@ -87,3 +87,4 @@ symbolizer-path.diff
remove-apple-clang-manpage.diff
mips-rdhwr.diff
clang-arm-default-vfp3-on-armv7a.patch
reproducible-pch.diff

8
debian/rules vendored
View File

@ -360,8 +360,8 @@ VERBOSE=VERBOSE=1
# ninja
#VERBOSE=-v
debian-stage2-build:
$(PRE_[PROCESS) make $(NJOBS) -C $(TARGET_BUILD) $(VERBOSE) CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1 stage2
debian-full-build:
$(PRE_PROCESS) make $(NJOBS) -C $(TARGET_BUILD) $(VERBOSE) CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1 stage2
# Check the stage 2 build worked
@ -442,7 +442,7 @@ debian-libcxxabi-build:
$(PRE_PROCESS_CONF) make $(NJOBS) $(VERBOSE) CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)"
touch $@
override_dh_auto_build: debian-stage2-build debian-libfuzzer-build debian-libcxx-build debian-libcxxabi-build
override_dh_auto_build: debian-full-build debian-libfuzzer-build debian-libcxx-build debian-libcxxabi-build
override_dh_prep: build_doc
dh_prep
@ -801,4 +801,4 @@ override_dh_auto_clean:
rm -f $(CURDIR)/clang/tools/clang-format/clang-format-$(LLVM_VERSION).py
rm -rf libcxx/build libcxxabi/build
.PHONY: override_dh_strip preconfigure debian-stage2-build debian-libfuzzer-build debian-libcxx-build debian-libcxxabi-build
.PHONY: override_dh_strip preconfigure debian-full-build debian-libfuzzer-build debian-libcxx-build debian-libcxxabi-build