<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/78b67f819222a83f7a198213fb8a1d0758cb7753">https://github.com/macports/macports-ports/commit/78b67f819222a83f7a198213fb8a1d0758cb7753</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 78b67f8 cctools: Bump to cctools-921 and add +llvm70
</span>78b67f8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 78b67f819222a83f7a198213fb8a1d0758cb7753
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Wed Nov 7 10:00:05 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> cctools: Bump to cctools-921 and add +llvm70
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
devel/cctools/Portfile | 49 ++++++---------
.../files/cctools-895-OFILE_LLVM_BITCODE.patch | 18 ------
devel/cctools/files/cctools-895-big_endian.patch | 12 ----
devel/cctools/files/cctools-921-noavx512.patch | 71 ++++++++++++++++++++++
4 files changed, 88 insertions(+), 62 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/Portfile b/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9dcdc55..30c62f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,10 +3,9 @@
</span> PortSystem 1.0
name cctools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Xcode 8.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 895
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set ld64_version 274.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Xcode 10.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 921
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ld64_version 409.12
</span> categories devel
platforms darwin
maintainers {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,34 +22,35 @@ master_sites http://opensource.apple.com/tarballs/${name} \
</span>
distfiles ld64-${ld64_version}.tar.gz ${name}-${version}.tar.gz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ld64-274.1.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c86030f9d6d44a6a53d262952d9508b5eff46353 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6cbe886717de833789fa562ec4889ebf9136ae5f7573d17d39836d3f5755b7ab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cctools-895.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e46dd79bd87c727f1326c569d0b8e9eadcc57495 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ce66034fa35117f9ae76bbb7dd72d8068c405778fa42e877e8a13237a10c5cb7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ld64-409.12.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 7d616147f3021872962850b1d5909f84a202d5d3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c34561b44210668c51e49efdb7d1e814a33056051ac7698571605ab968d31d5f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 730856 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cctools-921.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 fedeb6bae83f0322cd131895cc39c525bf549581 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 53449a7f2e316c7df5e6b94fd04e12b6d0356f2487d77aad3000134e4c010cc5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1755929
</span>
patchfiles cctools-829-lto.patch \
PR-37520.patch \
cctools-839-static-dis_info.patch \
PR-12400897.patch \
cctools-862-prunetrie.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cctools-895-big_endian.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cctools-895-OFILE_LLVM_BITCODE.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cctools-921-noavx512.patch \
</span> not-clang.patch
if {${os.major} < 11} {
patchfiles-append snowleopard-strnlen.patch
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set all_llvm_variants {llvm39 llvm40 llvm50 llvmdev}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set all_llvm_variants {llvm39 llvm40 llvm50 llvm60 llvm70 llvmdev}
</span> if {${os.major} < 12} {
lappend all_llvm_variants llvm34
}
if {${os.major} < 14} {
lappend all_llvm_variants llvm37
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-array set llvm_variant_version {llvm34 3.4 llvm37 3.7 llvm39 3.9 llvm40 4.0 llvm50 5.0 llvmdev devel}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+array set llvm_variant_version {llvm34 3.4 llvm37 3.7 llvm39 3.9 llvm40 4.0 llvm50 5.0 llvm60 6.0 llvm70 7.0 llvmdev devel}
</span> set llvm_version {}
foreach variantname $all_llvm_variants {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,19 +61,6 @@ foreach variantname $all_llvm_variants {
</span> "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Disable all llvm variants on Xcode 9 systems, to force use of xcode variant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# base has variant_set, but no variant_unset, so emulate it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-global variations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp $xcodeversion 9.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach variantname $all_llvm_variants {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset ${variantname}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "Forcibly disabling variant ${variantname}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants -${variantname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set variations(${variantname}) -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> proc some_llvm_variant_set {} {
global all_llvm_variants
foreach variantname $all_llvm_variants {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,14 +85,12 @@ if { ![some_llvm_variant_set] && ![variant_isset xcode] } {
</span> # default_variants +llvm33
# }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $xcodeversion 9.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +xcode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {![some_llvm_variant_set] && ${os.major} >= 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +llvm50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![some_llvm_variant_set] && ${os.major} >= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +llvm70
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant xcode conflicts universal description "Use Xcode supplied toolkit" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant xcode conflicts universal description "Use Xcode supplied cctools" {
</span> supported_archs noarch
patchfiles
distfiles
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/cctools-895-OFILE_LLVM_BITCODE.patch b/devel/cctools/files/cctools-895-OFILE_LLVM_BITCODE.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c137e4c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/files/cctools-895-OFILE_LLVM_BITCODE.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- misc/strings.c-orig 2016-12-09 19:03:02.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ misc/strings.c 2016-12-23 10:35:34.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -335,8 +335,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * If the ofile is not an object file then process it without reguard
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * to sections.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(ofile->object_addr == NULL || ofile->member_type == OFILE_LLVM_BITCODE){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(ofile->file_type == OFILE_FAT && ofile->arch_flag.cputype != 0){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(ofile->object_addr == NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef LTO_SUPPORT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || ofile->member_type == OFILE_LLVM_BITCODE){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* LTO_SUPPORT */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(ofile->file_type == OFILE_FAT && ofile->arch_flag.cputype != 0){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ofile->fat_header->magic == FAT_MAGIC_64){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- addr = ofile->file_addr +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ofile->fat_archs64[ofile->narch].offset;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/cctools-895-big_endian.patch b/devel/cctools/files/cctools-895-big_endian.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 92aa091..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/files/cctools-895-big_endian.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libstuff/ofile.c- 2016-12-16 11:53:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libstuff/ofile.c 2016-12-16 11:53:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3423,7 +3423,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(size - offset > sizeof(uint32_t)){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy(&magic, addr + offset, sizeof(uint32_t));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __BIG_ENDIAN__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(magic == FAT_MAGIC || (magic == FAT_MAGIC_64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(magic == FAT_MAGIC || magic == FAT_MAGIC_64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* __BIG_ENDIAN__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __LITTLE_ENDIAN__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(magic == SWAP_INT(FAT_MAGIC) ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/cctools-921-noavx512.patch b/devel/cctools/files/cctools-921-noavx512.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b9aa478
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cctools/files/cctools-921-noavx512.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,71 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naurp cctools-921.orig/include/mach/i386/thread_status.h cctools-921/include/mach/i386/thread_status.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/mach/i386/thread_status.h 2018-10-04 15:13:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/mach/i386/thread_status.h 2018-11-07 14:22:53.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -115,9 +115,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define x86_AVX_STATE32 16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define x86_AVX_STATE64 (x86_AVX_STATE32 + 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define x86_AVX_STATE (x86_AVX_STATE32 + 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define x86_AVX512_STATE32 19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define x86_AVX512_STATE64 (x86_AVX512_STATE32 + 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define x86_AVX512_STATE (x86_AVX512_STATE32 + 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,9 +145,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (x == x86_AVX_STATE32) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (x == x86_AVX_STATE64) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (x == x86_AVX_STATE) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (x == x86_AVX512_STATE32) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (x == x86_AVX512_STATE64) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (x == x86_AVX512_STATE) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (x == THREAD_STATE_NONE))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct x86_state_hdr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -194,10 +188,6 @@ typedef _STRUCT_X86_AVX_STATE32 x86_avx_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define x86_AVX_STATE32_COUNT ((mach_msg_type_number_t) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (sizeof(x86_avx_state32_t)/sizeof(unsigned int)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef _STRUCT_X86_AVX512_STATE32 x86_avx512_state32_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define x86_AVX512_STATE32_COUNT ((mach_msg_type_number_t) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (sizeof(x86_avx512_state32_t)/sizeof(unsigned int)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * to be deprecated in the future
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -229,10 +219,6 @@ typedef _STRUCT_X86_AVX_STATE64 x86_avx_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define x86_AVX_STATE64_COUNT ((mach_msg_type_number_t) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (sizeof(x86_avx_state64_t)/sizeof(unsigned int)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef _STRUCT_X86_AVX512_STATE64 x86_avx512_state64_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define x86_AVX512_STATE64_COUNT ((mach_msg_type_number_t) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (sizeof(x86_avx512_state64_t)/sizeof(unsigned int)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef _STRUCT_X86_EXCEPTION_STATE64 x86_exception_state64_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define x86_EXCEPTION_STATE64_COUNT ((mach_msg_type_number_t) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ( sizeof (x86_exception_state64_t) / sizeof (int) ))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -288,14 +274,6 @@ struct x86_avx_state {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } ufs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-struct x86_avx512_state {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x86_state_hdr_t ash;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- union {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x86_avx512_state32_t as32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x86_avx512_state64_t as64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } ufs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct x86_thread_state x86_thread_state_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define x86_THREAD_STATE_COUNT ((mach_msg_type_number_t) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ( sizeof (x86_thread_state_t) / sizeof (int) ))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -316,10 +294,6 @@ typedef struct x86_avx_state x86_avx_sta
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define x86_AVX_STATE_COUNT ((mach_msg_type_number_t) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (sizeof(x86_avx_state_t)/sizeof(unsigned int)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct x86_avx512_state x86_avx512_state_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define x86_AVX512_STATE_COUNT ((mach_msg_type_number_t) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (sizeof(x86_avx512_state_t)/sizeof(unsigned int)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Machine-independent way for servers and Mach's exception mechanism to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * choose the most efficient state flavor for exception RPC's:
</span></pre><pre style='margin:0'>
</pre>