Date: Thu, 19 Apr 2018 17:02:26 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467789 - in head/devel/llvm39: . files files/compiler-rt Message-ID: <201804191702.w3JH2QJe013600@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Thu Apr 19 17:02:25 2018 New Revision: 467789 URL: https://svnweb.freebsd.org/changeset/ports/467789 Log: Remove a needless include of vm/pmap.h which broke the i386 build with COMPILER_RT enabled on recent CURRENT. Rename files as if EXTRA_PATCHS+=compiler-rt were used, but don't use it due to compiler-rt's odd location in WRKDIR. No functional change. Added: head/devel/llvm39/files/compiler-rt/ head/devel/llvm39/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__linux.cc - copied, changed from r467788, head/devel/llvm39/files/compiler-rt-patch-canonical-syscalls head/devel/llvm39/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__platfrom__limit__posix.h - copied unchanged from r467788, head/devel/llvm39/files/compiler-rt-patch-ino64 head/devel/llvm39/files/compiler-rt/patch-svn-294806 - copied unchanged from r467788, head/devel/llvm39/files/compiler-rt-patch-svn-294806 Deleted: head/devel/llvm39/files/compiler-rt-patch-canonical-syscalls head/devel/llvm39/files/compiler-rt-patch-ino64 head/devel/llvm39/files/compiler-rt-patch-svn-294806 Modified: head/devel/llvm39/Makefile Modified: head/devel/llvm39/Makefile ============================================================================== --- head/devel/llvm39/Makefile Thu Apr 19 17:00:55 2018 (r467788) +++ head/devel/llvm39/Makefile Thu Apr 19 17:02:25 2018 (r467789) @@ -332,9 +332,9 @@ post-patch-CLANG-on: ${PATCH_WRKSRC}/tools/clang/lib/Driver/Tools.cpp post-patch-COMPILER_RT-on: - cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-svn-294806 - cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-canonical-syscalls - cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-ino64 + cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt/patch-svn-294806 + cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt/patch-lib_sanitizer__common_sanitizer__linux.cc + cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt/patch-lib_sanitizer__common_sanitizer__platfrom__limit__posix.h post-build-COMPILER_RT-on: ${MKDIR} ${WRKDIR}/compiler-rt-build Copied and modified: head/devel/llvm39/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__linux.cc (from r467788, head/devel/llvm39/files/compiler-rt-patch-canonical-syscalls) ============================================================================== --- head/devel/llvm39/files/compiler-rt-patch-canonical-syscalls Thu Apr 19 17:00:55 2018 (r467788, copy source) +++ head/devel/llvm39/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__linux.cc Thu Apr 19 17:02:25 2018 (r467789) @@ -1,8 +1,14 @@ -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) { +--- lib/sanitizer_common/sanitizer_linux.cc.orig 2017-01-06 20:57:47.000000000 +0000 ++++ lib/sanitizer_common/sanitizer_linux.cc 2018-04-19 17:03:38.293789000 +0100 +@@ -63,7 +63,6 @@ + #include <sys/exec.h> + #include <sys/sysctl.h> + #include <vm/vm_param.h> +-#include <vm/pmap.h> + #include <machine/atomic.h> + extern "C" { + // <sys/umtx.h> must be included after <errno.h> and <sys/types.h> on +@@ -223,7 +222,8 @@ static void kernel_stat_to_stat(struct k uptr internal_stat(const char *path, void *buf) { #if SANITIZER_FREEBSD @@ -12,7 +18,7 @@ index 7328a5c0ac1..4b59a39ee27 100644 #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) { +@@ -247,7 +247,8 @@ uptr internal_stat(const char *path, voi uptr internal_lstat(const char *path, void *buf) { #if SANITIZER_FREEBSD @@ -22,7 +28,7 @@ index 7328a5c0ac1..4b59a39ee27 100644 #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() { +@@ -590,7 +591,9 @@ uptr internal_getppid() { } uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count) { Copied: head/devel/llvm39/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__platfrom__limit__posix.h (from r467788, head/devel/llvm39/files/compiler-rt-patch-ino64) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm39/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__platfrom__limit__posix.h Thu Apr 19 17:02:25 2018 (r467789, copy of r467788, head/devel/llvm39/files/compiler-rt-patch-ino64) @@ -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 < 1200031 + 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 + }; Copied: head/devel/llvm39/files/compiler-rt/patch-svn-294806 (from r467788, head/devel/llvm39/files/compiler-rt-patch-svn-294806) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm39/files/compiler-rt/patch-svn-294806 Thu Apr 19 17:02:25 2018 (r467789, copy of r467788, head/devel/llvm39/files/compiler-rt-patch-svn-294806) @@ -0,0 +1,30 @@ +--- lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig 2016-04-26 10:41:30 UTC ++++ lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -23,11 +23,6 @@ + #ifdef _FILE_OFFSET_BITS + #undef _FILE_OFFSET_BITS + #endif +-#if SANITIZER_FREEBSD +-#define _WANT_RTENTRY +-#include <sys/param.h> +-#include <sys/socketvar.h> +-#endif + #include <arpa/inet.h> + #include <dirent.h> + #include <errno.h> +@@ -422,6 +417,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El + unsigned struct_input_absinfo_sz = sizeof(struct input_absinfo); + unsigned struct_input_id_sz = sizeof(struct input_id); + unsigned struct_mtpos_sz = sizeof(struct mtpos); ++ unsigned struct_rtentry_sz = sizeof(struct rtentry); + unsigned struct_termio_sz = sizeof(struct termio); + unsigned struct_vt_consize_sz = sizeof(struct vt_consize); + unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes); +@@ -441,7 +437,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El + unsigned struct_midi_info_sz = sizeof(struct midi_info); + unsigned struct_mtget_sz = sizeof(struct mtget); + unsigned struct_mtop_sz = sizeof(struct mtop); +- unsigned struct_rtentry_sz = sizeof(struct rtentry); + unsigned struct_sbi_instrument_sz = sizeof(struct sbi_instrument); + unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec); + unsigned struct_synth_info_sz = sizeof(struct synth_info);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804191702.w3JH2QJe013600>