<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/696999ee748486769ab775dc5906b0f632bba28c">https://github.com/macports/macports-ports/commit/696999ee748486769ab775dc5906b0f632bba28c</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 696999ee748 libmacho: update to 949.0.1
</span>696999ee748 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 696999ee748486769ab775dc5906b0f632bba28c
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Fri Jan 29 19:32:52 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> libmacho: update to 949.0.1
</span>---
devel/libmacho/Portfile | 25 ++--
...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 ++
.../files/cctools-949-nm-allow-no-lto-support.diff | 15 ++
...redo_prebinding-add-segg-addr-table-header.diff | 13 ++
.../files/cctools-949-write_object-fix.diff | 20 +++
7 files changed, 234 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libmacho/Portfile b/devel/libmacho/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e889268890..79f9280e237 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libmacho/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libmacho/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,11 +2,11 @@
</span>
PortSystem 1.0
name libmacho
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 927.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 949.0.1
</span> subport ${name}-headers { }
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {jeremyhu @jeremyhu} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {kencu @kencu} {jeremyhu @jeremyhu} openmaintainer
</span> license APSL-2
description libmacho is a library for managing mach-o files (parsing sections, etc)
long_description {*}${description} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,12 +18,16 @@ master_sites https://opensource.apple.com/tarballs/cctools/
</span>
distname cctools-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums 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 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-921-noavx512.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cctools-927-revert-i386-struct-header-changes.diff
</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:#e0ffe0;'>+ cctools-949-nm-allow-no-lto-support.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cctools-949-write_object-fix.diff
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,17 +52,10 @@ if {${subport} eq "${name}-headers"} {
</span> depends_lib-append port:libmacho-headers
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 18 || ${os.major} >= 20} {
</span> default_variants +universal
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # macOS 10.14's SDKs have newer versions that are needed to compile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} > 17} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${worksrcpath}/include/mach/i386
</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> build.dir ${worksrcpath}/libmacho
destroot.dir ${build.dir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libmacho/files/cctools-927-revert-i386-struct-header-changes.diff b/devel/libmacho/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/libmacho/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/libmacho/files/cctools-949-build-with-SDKs-older-than-1012.diff b/devel/libmacho/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..6f197b84e41
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libmacho/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 >= 101300
</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 >= 101300
</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 >= 101300
</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 >= 101300
</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 > 101300
</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 > 101300
</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 >= 101300
</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 >= 101300
</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 >= 101300
</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 >= 101300
</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 >= 101300
</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 >= 101300
</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/libmacho/files/cctools-949-libstuff-add-args-c.diff b/devel/libmacho/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/libmacho/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/libmacho/files/cctools-949-nm-allow-no-lto-support.diff b/devel/libmacho/files/cctools-949-nm-allow-no-lto-support.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c80c6870592
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libmacho/files/cctools-949-nm-allow-no-lto-support.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git misc/nm.c misc/nm.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d014c10..6ee4a98 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- misc/nm.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ misc/nm.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -542,8 +542,10 @@ void *cookie)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ process_flags.nlibs = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ process_flags.lib_names = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef LTO_SUPPORT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm_bundle_pointer = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm_bundle_size = 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(ofile->mh == NULL && ofile->mh64 == NULL){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef LTO_SUPPORT
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libmacho/files/cctools-949-redo_prebinding-add-segg-addr-table-header.diff b/devel/libmacho/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/libmacho/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/libmacho/files/cctools-949-write_object-fix.diff b/devel/libmacho/files/cctools-949-write_object-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a1e72b8ce4f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libmacho/files/cctools-949-write_object-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./as/write_object.c.orig 2021-01-27 11:08:23.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./as/write_object.c 2021-01-27 11:09:23.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1260,7 +1260,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return(2 * sizeof(struct relocation_info));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* the #if that follows is to silence a noisy "unreachable code" warning */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(ARM) || defined(SPARC) || defined(HPPA) || defined (PPC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* #if defined(ARM) || defined(SPARC) || defined(HPPA) || defined (PPC) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef PPC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(fixP->fx_r_type == PPC_RELOC_HI16)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sectdiff = PPC_RELOC_HI16_SECTDIFF;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1387,7 +1387,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *riP = *((struct relocation_info *)&sri);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return(2 * sizeof(struct relocation_info));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* unreachable code */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*#endif*/ /* unreachable code */
</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;'>+ * Determine if this is left as a local relocation entry or must be
</span></pre><pre style='margin:0'>
</pre>