sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to a new snapshot.

Browse source 
There is reason to believe that this snapshot fixes build issues on
10.x.

Catch up with the ino64 change.[0]

Submitted by:	kib [0]
This commit is contained in:
Brooks Davis 2017-05-24 21:38:51 +00:00
parent 20c2b1c355
commit b2bcdd023a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=441621
6 changed files with 82 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
devel/llvm-devel/Makefile
View file

@ -317,6 +317,10 @@ post-patch:
${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \
${WRKSRC}/CMakeLists.txt
post-patch-COMPILER_RT-on:
cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-ino64
cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-canonical-syscalls
post-build-COMPILER_RT-on:
${MKDIR} ${WRKDIR}/compiler-rt-build
cd ${WRKDIR}/compiler-rt-build && \

14
devel/llvm-devel/Makefile.snapshot
View file

@ -6,12 +6,12 @@
#
LLVM_MAJOR= 5.0
LLVM_RELEASE= ${LLVM_MAJOR}.0
SNAPDATE= 20170517
SNAPDATE= 20170524
LLVM_COMMIT= b5ad2b6b0b31a1af5ca24bca415227c74a72f278
CLANG_COMMIT= d4df3e3e59080c80f05a1a4aac88d59411516fda
COMPILER_RT_COMMIT= e1cd1705926eb39307a7239bf0531c55940a3639
EXTRAS_COMMIT= 3461e3d0efada03bb8636670ef394d4e315df309
LLD_COMMIT= 98da9e4388d93dcd13c723774635c5601aeb8bcb
LLDB_COMMIT= 084bf49f8cea5c974639d17c3dc0365ddec26370
LLVM_COMMIT= fee7735cee09bae1719d7822049e2adffa3159bf
CLANG_COMMIT= b28d2ee4c9f291941467723f7c5c48f47b0be951
COMPILER_RT_COMMIT= 03968223b794e6c6f9e482b7e05b2446966e76c3
EXTRAS_COMMIT= 092a04b5d878b22cc2b72d7e50f78864babc2274
LLD_COMMIT= 4f90705f5504708d3df8e8ba838e34dc8db9df6e
LLDB_COMMIT= aac68f4bab2e29bbbcbb5ed8e8e6bd1f2c6de889
OPENMP_COMMIT= e4c0f2b8d38151e64235df419e68a6bcb0799e53

26
devel/llvm-devel/distinfo
View file

@ -1,15 +1,15 @@
TIMESTAMP = 1495062161
SHA256 (llvm-mirror-llvm-5.0.d20170517-b5ad2b6b0b31a1af5ca24bca415227c74a72f278_GH0.tar.gz) = 17ee7743ce0779496c0f63dc635075b05123f649ecfdf5472ec58f8bc63823b8
SIZE (llvm-mirror-llvm-5.0.d20170517-b5ad2b6b0b31a1af5ca24bca415227c74a72f278_GH0.tar.gz) = 33514431
SHA256 (llvm-mirror-clang-d4df3e3e59080c80f05a1a4aac88d59411516fda_GH0.tar.gz) = eb2b31896549fc52d9da75a9d2187f3bdb2ba0e9895f05648e59daf709a1b616
SIZE (llvm-mirror-clang-d4df3e3e59080c80f05a1a4aac88d59411516fda_GH0.tar.gz) = 15717954
SHA256 (llvm-mirror-compiler-rt-e1cd1705926eb39307a7239bf0531c55940a3639_GH0.tar.gz) = 1172fcf9fbc23374d8f3d21a5bd72ef4c5db3527862f4eb8bf64d04aa3355c29
SIZE (llvm-mirror-compiler-rt-e1cd1705926eb39307a7239bf0531c55940a3639_GH0.tar.gz) = 2665312
SHA256 (llvm-mirror-clang-tools-extra-3461e3d0efada03bb8636670ef394d4e315df309_GH0.tar.gz) = e5fdb9deb6718e0bdd8dd422115260fece9c6b4a24ab5258850792cb87b91b63
SIZE (llvm-mirror-clang-tools-extra-3461e3d0efada03bb8636670ef394d4e315df309_GH0.tar.gz) = 862245
SHA256 (llvm-mirror-lld-98da9e4388d93dcd13c723774635c5601aeb8bcb_GH0.tar.gz) = a2abaf6d923d2a7dbb15d57442c48b3e937dc4ba5e3ff008743278d7cdb5d9d2
SIZE (llvm-mirror-lld-98da9e4388d93dcd13c723774635c5601aeb8bcb_GH0.tar.gz) = 837119
SHA256 (llvm-mirror-lldb-084bf49f8cea5c974639d17c3dc0365ddec26370_GH0.tar.gz) = 9994b614c29c79cfede36dc1ba4b55b538f7ccf79846bc3760341b241e330567
SIZE (llvm-mirror-lldb-084bf49f8cea5c974639d17c3dc0365ddec26370_GH0.tar.gz) = 24132652
TIMESTAMP = 1495655977
SHA256 (llvm-mirror-llvm-5.0.d20170524-fee7735cee09bae1719d7822049e2adffa3159bf_GH0.tar.gz) = d004b0ce5f41923c8e50b9e3bead2676452255331e71ecf67e92913d365727eb
SIZE (llvm-mirror-llvm-5.0.d20170524-fee7735cee09bae1719d7822049e2adffa3159bf_GH0.tar.gz) = 33585359
SHA256 (llvm-mirror-clang-b28d2ee4c9f291941467723f7c5c48f47b0be951_GH0.tar.gz) = 30e9b1d07f0c4e4a5e4d2998bd2b5beed1877d1e78e8e295396339a251ac6c8f
SIZE (llvm-mirror-clang-b28d2ee4c9f291941467723f7c5c48f47b0be951_GH0.tar.gz) = 15743398
SHA256 (llvm-mirror-compiler-rt-03968223b794e6c6f9e482b7e05b2446966e76c3_GH0.tar.gz) = 7554e5cd385881b6097af95b581a1a77c6843154a440dd4d4763a254c27b6925
SIZE (llvm-mirror-compiler-rt-03968223b794e6c6f9e482b7e05b2446966e76c3_GH0.tar.gz) = 2665185
SHA256 (llvm-mirror-clang-tools-extra-092a04b5d878b22cc2b72d7e50f78864babc2274_GH0.tar.gz) = 1782777e783d1060997d5a75f79dfe17173e05b3c4bc3ac86a40d11f6b32103e
SIZE (llvm-mirror-clang-tools-extra-092a04b5d878b22cc2b72d7e50f78864babc2274_GH0.tar.gz) = 863467
SHA256 (llvm-mirror-lld-4f90705f5504708d3df8e8ba838e34dc8db9df6e_GH0.tar.gz) = 8dd2541e51561128d3b851020d750715e3bd76a9d0e22d068bc0ff1f77ee17d9
SIZE (llvm-mirror-lld-4f90705f5504708d3df8e8ba838e34dc8db9df6e_GH0.tar.gz) = 833010
SHA256 (llvm-mirror-lldb-aac68f4bab2e29bbbcbb5ed8e8e6bd1f2c6de889_GH0.tar.gz) = c758b18307bb6d6fd7ba19c838f9db8ee179180818b6f7a261ed64ffc6333b07
SIZE (llvm-mirror-lldb-aac68f4bab2e29bbbcbb5ed8e8e6bd1f2c6de889_GH0.tar.gz) = 24129804
SHA256 (llvm-mirror-openmp-e4c0f2b8d38151e64235df419e68a6bcb0799e53_GH0.tar.gz) = c67fd5821a7f8a1eb5ef2c87934ed712bd67398c684edd3b3289d51ca8b0db88
SIZE (llvm-mirror-openmp-e4c0f2b8d38151e64235df419e68a6bcb0799e53_GH0.tar.gz) = 2884703

35
devel/llvm-devel/files/compiler-rt-patch-canonical-syscalls Normal file
View file

@ -0,0 +1,35 @@
diff --git lib/sanitizer_common/sanitizer_linux.cc lib/sanitizer_common/sanitizer_linux.cc
index 7328a5c0ac1..4b59a39ee27 100644
--- lib/sanitizer_common/sanitizer_linux.cc
+++ lib/sanitizer_common/sanitizer_linux.cc
@@ -223,7 +223,8 @@ static void kernel_stat_to_stat(struct kernel_stat *in, struct stat *out) {
uptr internal_stat(const char *path, void *buf) {
#if SANITIZER_FREEBSD
- return internal_syscall(SYSCALL(stat), path, buf);
+ return internal_syscall(SYSCALL(fstatat), AT_FDCWD, (uptr)path,
+ (uptr)buf, 0);
#elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
return internal_syscall(SYSCALL(newfstatat), AT_FDCWD, (uptr)path,
(uptr)buf, 0);
@@ -247,7 +248,8 @@ uptr internal_stat(const char *path, void *buf) {
uptr internal_lstat(const char *path, void *buf) {
#if SANITIZER_FREEBSD
- return internal_syscall(SYSCALL(lstat), path, buf);
+ return internal_syscall(SYSCALL(fstatat), AT_FDCWD, (uptr)path,
+ (uptr)buf, AT_SYMLINK_NOFOLLOW);
#elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
return internal_syscall(SYSCALL(newfstatat), AT_FDCWD, (uptr)path,
(uptr)buf, AT_SYMLINK_NOFOLLOW);
@@ -590,7 +592,9 @@ uptr internal_getppid() {
}
uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count) {
-#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
+#if SANITIZER_FREEBSD
+ return internal_syscall(SYSCALL(getdirentries), fd, (uptr)dirp, count, NULL);
+#elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
return internal_syscall(SYSCALL(getdents64), fd, (uptr)dirp, count);
#else
return internal_syscall(SYSCALL(getdents), fd, (uptr)dirp, count);

15
devel/llvm-devel/files/compiler-rt-patch-ino64 Normal file
View file

@ -0,0 +1,15 @@
--- lib/sanitizer_common/sanitizer_platform_limits_posix.h.orig 2017-05-24 19:09:24.000000000 +0000
+++ lib/sanitizer_common/sanitizer_platform_limits_posix.h 2017-05-24 20:12:47.183536000 +0000
@@ -485,7 +485,12 @@
};
#elif SANITIZER_FREEBSD
struct __sanitizer_dirent {
+#if __FreeBSD_version < 1200030
unsigned int d_fileno;
+#else
+ unsigned long long d_fileno;
+ unsigned long long d_off;
+#endif
unsigned short d_reclen;
// more fields that we don't care about
};

10
devel/llvm-devel/pkg-plist
View file

@ -1489,7 +1489,6 @@ llvm-devel/include/llvm/DebugInfo/CodeView/CVDebugRecord.h
llvm-devel/include/llvm/DebugInfo/CodeView/CVRecord.h
llvm-devel/include/llvm/DebugInfo/CodeView/CVSymbolTypes.def
llvm-devel/include/llvm/DebugInfo/CodeView/CVSymbolVisitor.h
llvm-devel/include/llvm/DebugInfo/CodeView/CVTypeDumper.h
llvm-devel/include/llvm/DebugInfo/CodeView/CVTypeVisitor.h
llvm-devel/include/llvm/DebugInfo/CodeView/CodeView.h
llvm-devel/include/llvm/DebugInfo/CodeView/CodeViewError.h
@ -1497,6 +1496,7 @@ llvm-devel/include/llvm/DebugInfo/CodeView/CodeViewRecordIO.h
llvm-devel/include/llvm/DebugInfo/CodeView/EnumTables.h
llvm-devel/include/llvm/DebugInfo/CodeView/Formatters.h
llvm-devel/include/llvm/DebugInfo/CodeView/FunctionId.h
llvm-devel/include/llvm/DebugInfo/CodeView/LazyRandomTypeCollection.h
llvm-devel/include/llvm/DebugInfo/CodeView/Line.h
llvm-devel/include/llvm/DebugInfo/CodeView/ModuleDebugFileChecksumFragment.h
llvm-devel/include/llvm/DebugInfo/CodeView/ModuleDebugFragment.h
@ -1505,7 +1505,6 @@ llvm-devel/include/llvm/DebugInfo/CodeView/ModuleDebugFragmentVisitor.h
llvm-devel/include/llvm/DebugInfo/CodeView/ModuleDebugInlineeLinesFragment.h
llvm-devel/include/llvm/DebugInfo/CodeView/ModuleDebugLineFragment.h
llvm-devel/include/llvm/DebugInfo/CodeView/ModuleDebugUnknownFragment.h
llvm-devel/include/llvm/DebugInfo/CodeView/RandomAccessTypeVisitor.h
llvm-devel/include/llvm/DebugInfo/CodeView/RecordSerialization.h
llvm-devel/include/llvm/DebugInfo/CodeView/StringTable.h
llvm-devel/include/llvm/DebugInfo/CodeView/SymbolDeserializer.h
@ -1517,6 +1516,7 @@ llvm-devel/include/llvm/DebugInfo/CodeView/SymbolSerializer.h
llvm-devel/include/llvm/DebugInfo/CodeView/SymbolVisitorCallbackPipeline.h
llvm-devel/include/llvm/DebugInfo/CodeView/SymbolVisitorCallbacks.h
llvm-devel/include/llvm/DebugInfo/CodeView/SymbolVisitorDelegate.h
llvm-devel/include/llvm/DebugInfo/CodeView/TypeCollection.h
llvm-devel/include/llvm/DebugInfo/CodeView/TypeDatabase.h
llvm-devel/include/llvm/DebugInfo/CodeView/TypeDatabaseVisitor.h
llvm-devel/include/llvm/DebugInfo/CodeView/TypeDeserializer.h
@ -1531,6 +1531,7 @@ llvm-devel/include/llvm/DebugInfo/CodeView/TypeServerHandler.h
llvm-devel/include/llvm/DebugInfo/CodeView/TypeStreamMerger.h
llvm-devel/include/llvm/DebugInfo/CodeView/TypeSymbolEmitter.h
llvm-devel/include/llvm/DebugInfo/CodeView/TypeTableBuilder.h
llvm-devel/include/llvm/DebugInfo/CodeView/TypeTableCollection.h
llvm-devel/include/llvm/DebugInfo/CodeView/TypeVisitorCallbackPipeline.h
llvm-devel/include/llvm/DebugInfo/CodeView/TypeVisitorCallbacks.h
llvm-devel/include/llvm/DebugInfo/DIContext.h
@ -1715,6 +1716,7 @@ llvm-devel/include/llvm/IR/DebugInfoFlags.def
llvm-devel/include/llvm/IR/DebugInfoMetadata.h
llvm-devel/include/llvm/IR/DebugLoc.h
llvm-devel/include/llvm/IR/DerivedTypes.h
llvm-devel/include/llvm/IR/DerivedUser.h
llvm-devel/include/llvm/IR/DiagnosticInfo.h
llvm-devel/include/llvm/IR/DiagnosticPrinter.h
llvm-devel/include/llvm/IR/Dominators.h
@ -1882,6 +1884,7 @@ llvm-devel/include/llvm/Object/ArchiveWriter.h
llvm-devel/include/llvm/Object/Binary.h
llvm-devel/include/llvm/Object/COFF.h
llvm-devel/include/llvm/Object/COFFImportFile.h
llvm-devel/include/llvm/Object/COFFModuleDefinition.h
llvm-devel/include/llvm/Object/Decompressor.h
llvm-devel/include/llvm/Object/ELF.h
llvm-devel/include/llvm/Object/ELFObjectFile.h
@ -1898,6 +1901,7 @@ llvm-devel/include/llvm/Object/StackMapParser.h
llvm-devel/include/llvm/Object/SymbolSize.h
llvm-devel/include/llvm/Object/SymbolicFile.h
llvm-devel/include/llvm/Object/Wasm.h
llvm-devel/include/llvm/Object/WindowsResource.h
llvm-devel/include/llvm/ObjectYAML/COFFYAML.h
llvm-devel/include/llvm/ObjectYAML/DWARFEmitter.h
llvm-devel/include/llvm/ObjectYAML/DWARFYAML.h
@ -2529,6 +2533,7 @@ llvm-devel/lib/libLTO.so.%%LLVM_RELEASE%%svn
%%CLANG%%llvm-devel/lib/libclangBasic.a
%%CLANG%%llvm-devel/lib/libclangChangeNamespace.a
%%CLANG%%llvm-devel/lib/libclangCodeGen.a
%%CLANG%%llvm-devel/lib/libclangDaemon.a
%%CLANG%%llvm-devel/lib/libclangDriver.a
%%CLANG%%llvm-devel/lib/libclangDynamicASTMatchers.a
%%CLANG%%llvm-devel/lib/libclangEdit.a
@ -2673,6 +2678,7 @@ llvm-devel/lib/libLTO.so.%%LLVM_RELEASE%%svn
%%OPENMP%%llvm-devel/lib/libomptarget.so
%%CLANG%%llvm-devel/libexec/c++-analyzer
%%CLANG%%llvm-devel/libexec/ccc-analyzer
%%CLANG%%llvm-devel/share/clang/bash-autocomplete.sh
%%CLANG%%llvm-devel/share/clang/clang-format-bbedit.applescript
%%CLANG%%llvm-devel/share/clang/clang-format-diff.py
%%CLANG%%llvm-devel/share/clang/clang-format-sublime.py