<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/45621bb9da65d4a8f1c378cc08f6d0156a1b4635">https://github.com/macports/macports-ports/commit/45621bb9da65d4a8f1c378cc08f6d0156a1b4635</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 45621bb9da65d4a8f1c378cc08f6d0156a1b4635
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sat Apr 18 14:52:22 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> cctools: bump to 949.0.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> correlates with xcode 11.3.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> remove rsrc fork stripping workaround
</span><span style='display:block; white-space:pre;color:#404040;'> there don't seem to be rsrc forks in cctools any longer
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> fix build with older SDKs and older compilers
</span><span style='display:block; white-space:pre;color:#404040;'> various minor workarounds to allow build with SDKs < 10.12
</span><span style='display:block; white-space:pre;color:#404040;'> and with older compilers that don't support __has_include
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/58749
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/61133
</span>---
devel/cctools/Portfile | 70 +++------
devel/cctools/files/PR-37520.patch | 19 ---
.../files/cctools-839-static-dis_info.patch | 22 ---
...ools-927-revert-i386-struct-header-changes.diff | 15 --
...ctools-949-build-with-SDKs-older-than-1012.diff | 162 +++++++++++++++++++++
.../files/cctools-949-libstuff-add-args-c.diff | 13 ++
...redo_prebinding-add-segg-addr-table-header.diff | 13 ++
...around-older-compilers-without-has-include.diff | 13 ++
8 files changed, 224 insertions(+), 103 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 16c688d6ba3..e099497dc20 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,12 @@
</span> PortSystem 1.0
name cctools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Xcode 10.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 927.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set ld64_version 450.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Xcode 11.3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 949.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ld64_version 530
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories devel
platforms darwin
maintainers {jeremyhu @jeremyhu} {kencu @kencu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,26 +25,30 @@ master_sites https://opensource.apple.com/tarballs/${name}:main \
</span>
distfiles ld64-${ld64_version}.tar.gz:ld64 ${name}-${version}.tar.gz:main
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ld64-450.3.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4d263cff143228e021c438d3c2d1800ff367c895 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 140619e676e099581771dbad98277850ff731cd23938bed95b4d7171616acca1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 729639 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cctools-927.0.2.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 74c906d45173aaa804cba911677dbf64407cfada \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3d5d35e7120aac187de306019d4b53b3b08dd7ebf48764fcd5c8cefef40b3dbf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1842624
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ld64-530.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 793d012a611de5a044db3f97c6a9ec149072aff6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ee37f0487601c08c7d133bc91cad2e9084d00d02aa4709d228a9a065960aa187 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 744871 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cctools-949.0.1.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6412d9c5aea6aadd88cd9abdde6c1383f103b582 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 830485ac7c563cd55331f643952caab2f0690dfbd01e92eb432c45098b28a5d0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1968671
</span>
patchfiles cctools-829-lto.patch \
PR-37520.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cctools-839-static-dis_info.patch \
</span> PR-12400897.patch \
cctools-862-prunetrie.patch \
cctools-921-noavx512.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- as-try-clang.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as-try-clang.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cctools-949-libstuff-add-args-c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cctools-949-redo_prebinding-add-segg-addr-table-header.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cctools-949-build-with-SDKs-older-than-1012.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# there is a change in cctools/include/mach/i386/_structs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# that causes the build to fail on older systems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append cctools-927-revert-i386-struct-header-changes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset xcode]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cd ${workpath}/ld64-${ld64_version} && patch -p0 < ${filespath}/ld64-512-work-around-older-compilers-without-has-include.diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {${os.major} < 11} {
patchfiles-append snowleopard-strnlen.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,17 +168,6 @@ post-patch {
</span>
# Use our chosen version of llvm
if {${llvm_version} ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach file ${worksrcpath}/otool/main.c {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "deleting stray rsrc fork from ${file}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cp -X ${file} ${file}.tmp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "mv ${file}.tmp ${file}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cp /dev/null ${file}/rsrc"
</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> reinplace "s:\"llvm-objdump\":\"llvm-objdump-mp-${llvm_version}\":" ${worksrcpath}/otool/main.c
reinplace "s:\"llvm-mc\":\"llvm-mc-mp-${llvm_version}\":" ${worksrcpath}/as/driver.c
reinplace "s:@@LLVM_LIBDIR@@:${prefix}/libexec/llvm-${llvm_version}/lib:" ${worksrcpath}/libstuff/lto.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,26 +203,7 @@ post-patch {
</span> }
reinplace "s:__TRY_SYSTEM_CLANG__:${try_system_clang}:" ${worksrcpath}/as/driver.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach file [glob ${worksrcpath}/man/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "deleting stray rsrc fork from ${file}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cp -X ${file} ${file}.tmp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "mv ${file}.tmp ${file}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cp /dev/null ${file}/rsrc"
</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> foreach file [glob ${worksrcpath}/{*/,}Makefile] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "deleting stray rsrc fork from ${file}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cp -X ${file} ${file}.tmp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "mv ${file}.tmp ${file}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cp /dev/null ${file}/rsrc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace -q "s:/usr/local:@PREFIX@:g" ${file}
reinplace -q "s:/usr:@PREFIX@:g" ${file}
reinplace -q "s:@PREFIX@:${prefix}:g" ${file}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/PR-37520.patch b/devel/cctools/files/PR-37520.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index fcac838fb5f..851e2860191 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/files/PR-37520.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cctools/files/PR-37520.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- as/ppc.c.orig 2013-01-04 10:39:49.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ as/ppc.c 2013-01-04 10:40:02.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1019,6 +1019,8 @@ char *op)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* if this instruction requires labels mark it for later */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch(insn.reloc){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case NO_RELOC:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case PPC_RELOC_HI16:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case PPC_RELOC_LO16:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case PPC_RELOC_HA16:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1033,6 +1035,7 @@ char *op)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- insn.reloc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case PPC_RELOC_BR14:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case PPC_RELOC_BR14_predicted:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fix_new(frag_now,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- thisfrag - frag_now->fr_literal,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4,
</span> --- as/m88k.c.orig 1969-12-31 16:00:00.000000000 -0800
+++ as/m88k.c 2013-07-05 10:32:19.000000000 -0700
@@ -600,6 +600,10 @@ char *op)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/cctools-839-static-dis_info.patch b/devel/cctools/files/cctools-839-static-dis_info.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3a490ce34e6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/files/cctools-839-static-dis_info.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- otool/arm_disasm.c.orig 2013-08-29 14:23:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ otool/arm_disasm.c 2013-08-29 14:23:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,7 +62,7 @@ typedef char bfd_byte;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* HACKS to avoid pulling in all of FSF binutils include/dis-asm.h */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef int (*fprintf_ftype) (void *, const char*, ...);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--struct disassemble_info { /* HACK'ed up for just what we need here */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static struct disassemble_info { /* HACK'ed up for just what we need here */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf_ftype fprintf_func;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *stream;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- otool/i386_disasm.c.orig 2013-08-29 14:23:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ otool/i386_disasm.c 2013-08-29 14:24:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1600,7 +1600,7 @@ static unsigned int xmm_rm(int r_m, int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * This is passed to the llvm disassembler.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--struct disassemble_info {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static struct disassemble_info {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enum bool verbose;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Relocation information. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct relocation_info *sorted_relocs;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/cctools-927-revert-i386-struct-header-changes.diff b/devel/cctools/files/cctools-927-revert-i386-struct-header-changes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f77f8dfe69b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/files/cctools-927-revert-i386-struct-header-changes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/mach/i386/_structs.h.orig 2020-02-09 10:59:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/mach/i386/_structs.h 2020-02-09 10:59:34.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -627,7 +627,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _STRUCT_XMM_REG __fpu_ymmh15; /* YMMH 15 */
</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;'>--#endif /* not __OPEN_SOURCE__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else /* !__DARWIN_UNIX03 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _STRUCT_X86_FLOAT_STATE64 struct x86_float_state64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -800,3 +799,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* !__DARWIN_UNIX03 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* _MACH_I386__STRUCTS_H_ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/cctools-949-build-with-SDKs-older-than-1012.diff b/devel/cctools/files/cctools-949-build-with-SDKs-older-than-1012.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..707f1424fdf
</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-949-build-with-SDKs-older-than-1012.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,162 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libstuff/writeout.c libstuff/writeout.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 50cbb8d..b1675e7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libstuff/writeout.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libstuff/writeout.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,17 +142,25 @@ uint32_t *throttle)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ seen_archive = FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __OPENSTEP__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED > 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (__builtin_available(macOS 10.12, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (clock_gettime(CLOCK_REALTIME, &toc_timespec)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system_error("clock_gettime failed");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (gettimeofday(&toc_timeval, NULL)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system_error("gettimeofday failed");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</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;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED > 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * The environment variable ZERO_AR_DATE is used here and other
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -291,6 +299,8 @@ no_throttle:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * have been zeroed out when the library was created. writeout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * will not zero out the modification time in the filesystem.
</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;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED > 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (__builtin_available(macOS 10.12, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct timespec times[2] = {0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(×[0], &toc_timespec, sizeof(struct timespec));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -298,11 +308,16 @@ no_throttle:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time_result = utimensat(AT_FDCWD, output, times, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct timeval times[2] = {0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(×[0], &toc_timeval, sizeof(struct timeval));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(×[1], &toc_timeval, sizeof(struct timeval));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time_result = utimes(output, times);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED > 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timep[0] = toc_time;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timep[1] = toc_time;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git misc/libtool.c misc/libtool.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bb18341..067f107 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- misc/libtool.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ misc/libtool.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1325,6 +1325,7 @@ char **envp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* remember common values used in the archive table of contents */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cmd_flags.D == FALSE && zero_ar_date == FALSE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __OPENSTEP__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED > 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (__builtin_available(macOS 10.12, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (clock_gettime(CLOCK_REALTIME, &toc_timespec)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system_fatal("clock_gettime failed");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1332,12 +1333,18 @@ char **envp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ toc_time = toc_timespec.tv_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (gettimeofday(&toc_timeval, NULL)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system_fatal("gettimeofday failed");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return(EXIT_FAILURE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ toc_time = toc_timeval.tv_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED > 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ toc_time = time(NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* !defined(__OPENSTEP__) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3023,6 +3030,8 @@ struct ofile *ofile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * when we first closed it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __OPENSTEP__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED > 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (__builtin_available(macOS 10.12, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct timespec times[2];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(×[0], &stat_buf.st_atimespec, sizeof(struct timespec));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3030,10 +3039,14 @@ struct ofile *ofile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time_result = utimensat(AT_FDCWD, tempfile, times, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIMESPEC_TO_TIMEVAL(&timep[0], &stat_buf.st_atimespec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIMESPEC_TO_TIMEVAL(&timep[1], &stat_buf.st_mtimespec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time_result = utimes(tempfile, timep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED > 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timep[0] = stat_buf.st_mtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timep[1] = stat_buf.st_mtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git misc/lipo.c misc/lipo.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bb0cb86..62d86ab 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- misc/lipo.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ misc/lipo.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -621,13 +621,21 @@ unknown_flag:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(close(fd) == -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system_fatal("can't close output file: %s",output_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __OPENSTEP__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED > 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (__builtin_available(macOS 10.12, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time_result = utimensat(AT_FDCWD, output_file,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output_times, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time_result = utimes(output_file, output_timev);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED > 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time_result = utime(output_file, output_timep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1155,6 +1163,7 @@ struct input_file *input)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Select the first modify time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED > 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (__builtin_available(macOS 10.12, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (output_times[1].tv_sec == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(&output_times[0], &stat_buf.st_atimespec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1163,11 +1172,16 @@ struct input_file *input)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sizeof(struct timespec));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (output_timev[1].tv_sec == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIMESPEC_TO_TIMEVAL(&output_timev[0], &stat_buf.st_atimespec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIMESPEC_TO_TIMEVAL(&output_timev[1], &stat_buf.st_mtimespec);
</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;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED > 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Select the eariliest modify time so that if the output file
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/cctools-949-libstuff-add-args-c.diff b/devel/cctools/files/cctools-949-libstuff-add-args-c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d8d5330ac41
</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-949-libstuff-add-args-c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libstuff/Makefile libstuff/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 975a5f6..da5a411 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libstuff/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libstuff/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@ ifeq "$(EFITOOLS)" "efitools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COFF_BYTESEX =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFILES = allocate.c errors.c arch.c execute.c bytesex.c rnd.c hppa.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFILES = args.c allocate.c errors.c arch.c execute.c bytesex.c rnd.c hppa.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ swap_headers.c reloc.c version_number.c get_toc_byte_sex.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ best_arch.c fatals.c arch_usage.c ofile.c ofile_error.c print.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_arch_flag_name.c seg_addr_table.c dylib_table.c write64.c \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/cctools-949-redo_prebinding-add-segg-addr-table-header.diff b/devel/cctools/files/cctools-949-redo_prebinding-add-segg-addr-table-header.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0f2fd3e6bc9
</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-949-redo_prebinding-add-segg-addr-table-header.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git misc/redo_prebinding.c misc/redo_prebinding.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8867b55..c47808b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- misc/redo_prebinding.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ misc/redo_prebinding.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,7 +106,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <stuff/hppa.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <stuff/execute.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <stuff/guess_short_name.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-//#import <stuff/seg_addr_table.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import <stuff/seg_addr_table.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <stuff/macosx_deployment_target.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mach-o/dyld.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/ld64-512-work-around-older-compilers-without-has-include.diff b/devel/cctools/files/ld64-512-work-around-older-compilers-without-has-include.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b6585d705b0
</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/ld64-512-work-around-older-compilers-without-has-include.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/abstraction/MachOFileAbstraction.hpp.orig 2020-04-22 18:23:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/abstraction/MachOFileAbstraction.hpp 2020-04-22 18:38:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,6 +79,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define N_COLD_FUNC 0x0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __has_include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __has_include(x) 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if __has_include(<mach-o/fixup-chains2.h>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mach-o/fixup-chains.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span></pre><pre style='margin:0'>
</pre>