Merge pull request #11684 from ziglang/fix-10318

Set macOS/iPhoneOS/tvOS/watchOS ABI to none (unspecified) by default
2022-05-22 19:29:42 -04:00
parent b56b4428a3 cbefd354a6
commit b64a1d5abb
274 changed files with 61 additions and 36 deletions
--- a/ci/azure/macos_arm64_script
+++ b/ci/azure/macos_arm64_script
@@ -8,15 +8,15 @@ brew update && brew install ncurses s3cmd
 ZIGDIR="$(pwd)"

 HOST_ARCH="x86_64"
-HOST_TARGET="$HOST_ARCH-macos-gnu"
+HOST_TARGET="$HOST_ARCH-macos-none"
 HOST_MCPU="baseline"
-HOST_CACHE_BASENAME="zig+llvm+lld+clang-$HOST_TARGET-0.9.1"
+HOST_CACHE_BASENAME="zig+llvm+lld+clang-$HOST_TARGET-0.10.0-dev.2348+d43761808"
 HOST_PREFIX="$HOME/$HOST_CACHE_BASENAME"

 ARCH="aarch64"
-TARGET="$ARCH-macos-gnu"
+TARGET="$ARCH-macos-none"
 MCPU="apple_a14"
-CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.9.1"
+CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.10.0-dev.2348+d43761808"
 PREFIX="$HOME/$CACHE_BASENAME"

 JOBS="-j2"
--- a/ci/azure/macos_script
+++ b/ci/azure/macos_script
@@ -7,9 +7,9 @@ brew update && brew install ncurses s3cmd

 ZIGDIR="$(pwd)"
 ARCH="x86_64"
-TARGET="$ARCH-macos-gnu"
+TARGET="$ARCH-macos-none"
 MCPU="baseline"
-CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.9.1"
+CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.10.0-dev.2348+d43761808"
 PREFIX="$HOME/$CACHE_BASENAME"
 JOBS="-j2"

--- a/lib/libc/include/aarch64-macos.11-none/arm/_limits.h
+++ b/lib/libc/include/aarch64-macos.11-none/arm/_limits.h
--- a/lib/libc/include/aarch64-macos.11-none/arm/_mcontext.h
+++ b/lib/libc/include/aarch64-macos.11-none/arm/_mcontext.h
--- a/lib/libc/include/aarch64-macos.11-none/arm/_param.h
+++ b/lib/libc/include/aarch64-macos.11-none/arm/_param.h
--- a/lib/libc/include/aarch64-macos.11-none/arm/_types.h
+++ b/lib/libc/include/aarch64-macos.11-none/arm/_types.h
--- a/lib/libc/include/aarch64-macos.11-none/arm/arch.h
+++ b/lib/libc/include/aarch64-macos.11-none/arm/arch.h
--- a/lib/libc/include/aarch64-macos.11-none/arm/endian.h
+++ b/lib/libc/include/aarch64-macos.11-none/arm/endian.h
--- a/lib/libc/include/aarch64-macos.11-none/arm/limits.h
+++ b/lib/libc/include/aarch64-macos.11-none/arm/limits.h
--- a/lib/libc/include/aarch64-macos.11-none/arm/param.h
+++ b/lib/libc/include/aarch64-macos.11-none/arm/param.h
--- a/lib/libc/include/aarch64-macos.11-none/arm/signal.h
+++ b/lib/libc/include/aarch64-macos.11-none/arm/signal.h
--- a/lib/libc/include/aarch64-macos.11-none/arm/types.h
+++ b/lib/libc/include/aarch64-macos.11-none/arm/types.h
--- a/lib/libc/include/aarch64-macos.11-none/libkern/OSAtomic.h
+++ b/lib/libc/include/aarch64-macos.11-none/libkern/OSAtomic.h
--- a/lib/libc/include/aarch64-macos.11-none/libkern/OSAtomicDeprecated.h
+++ b/lib/libc/include/aarch64-macos.11-none/libkern/OSAtomicDeprecated.h
--- a/lib/libc/include/aarch64-macos.11-none/libkern/OSAtomicQueue.h
+++ b/lib/libc/include/aarch64-macos.11-none/libkern/OSAtomicQueue.h
--- a/lib/libc/include/aarch64-macos.11-none/libkern/OSSpinLockDeprecated.h
+++ b/lib/libc/include/aarch64-macos.11-none/libkern/OSSpinLockDeprecated.h
--- a/lib/libc/include/aarch64-macos.11-none/libkern/arm/OSByteOrder.h
+++ b/lib/libc/include/aarch64-macos.11-none/libkern/arm/OSByteOrder.h
--- a/lib/libc/include/aarch64-macos.11-none/mach/arm/_structs.h
+++ b/lib/libc/include/aarch64-macos.11-none/mach/arm/_structs.h
--- a/lib/libc/include/aarch64-macos.11-none/mach/arm/boolean.h
+++ b/lib/libc/include/aarch64-macos.11-none/mach/arm/boolean.h
--- a/lib/libc/include/aarch64-macos.11-none/mach/arm/exception.h
+++ b/lib/libc/include/aarch64-macos.11-none/mach/arm/exception.h
--- a/lib/libc/include/aarch64-macos.11-none/mach/arm/kern_return.h
+++ b/lib/libc/include/aarch64-macos.11-none/mach/arm/kern_return.h
--- a/lib/libc/include/aarch64-macos.11-none/mach/arm/processor_info.h
+++ b/lib/libc/include/aarch64-macos.11-none/mach/arm/processor_info.h
--- a/lib/libc/include/aarch64-macos.11-none/mach/arm/rpc.h
+++ b/lib/libc/include/aarch64-macos.11-none/mach/arm/rpc.h
--- a/lib/libc/include/aarch64-macos.11-none/mach/arm/thread_state.h
+++ b/lib/libc/include/aarch64-macos.11-none/mach/arm/thread_state.h
--- a/lib/libc/include/aarch64-macos.11-none/mach/arm/thread_status.h
+++ b/lib/libc/include/aarch64-macos.11-none/mach/arm/thread_status.h
--- a/lib/libc/include/aarch64-macos.11-none/mach/arm/vm_param.h
+++ b/lib/libc/include/aarch64-macos.11-none/mach/arm/vm_param.h
--- a/lib/libc/include/aarch64-macos.11-none/mach/arm/vm_types.h
+++ b/lib/libc/include/aarch64-macos.11-none/mach/arm/vm_types.h
--- a/lib/libc/include/aarch64-macos.12-none/arm/_limits.h
+++ b/lib/libc/include/aarch64-macos.12-none/arm/_limits.h
--- a/lib/libc/include/aarch64-macos.12-none/arm/_mcontext.h
+++ b/lib/libc/include/aarch64-macos.12-none/arm/_mcontext.h
--- a/lib/libc/include/aarch64-macos.12-none/arm/_param.h
+++ b/lib/libc/include/aarch64-macos.12-none/arm/_param.h
--- a/lib/libc/include/aarch64-macos.12-none/arm/_types.h
+++ b/lib/libc/include/aarch64-macos.12-none/arm/_types.h
--- a/lib/libc/include/aarch64-macos.12-none/arm/arch.h
+++ b/lib/libc/include/aarch64-macos.12-none/arm/arch.h
--- a/lib/libc/include/aarch64-macos.12-none/arm/endian.h
+++ b/lib/libc/include/aarch64-macos.12-none/arm/endian.h
--- a/lib/libc/include/aarch64-macos.12-none/arm/limits.h
+++ b/lib/libc/include/aarch64-macos.12-none/arm/limits.h
--- a/lib/libc/include/aarch64-macos.12-none/arm/param.h
+++ b/lib/libc/include/aarch64-macos.12-none/arm/param.h
--- a/lib/libc/include/aarch64-macos.12-none/arm/signal.h
+++ b/lib/libc/include/aarch64-macos.12-none/arm/signal.h
--- a/lib/libc/include/aarch64-macos.12-none/arm/types.h
+++ b/lib/libc/include/aarch64-macos.12-none/arm/types.h
--- a/lib/libc/include/aarch64-macos.12-none/libkern/OSAtomic.h
+++ b/lib/libc/include/aarch64-macos.12-none/libkern/OSAtomic.h
--- a/lib/libc/include/aarch64-macos.12-none/libkern/OSAtomicDeprecated.h
+++ b/lib/libc/include/aarch64-macos.12-none/libkern/OSAtomicDeprecated.h
--- a/lib/libc/include/aarch64-macos.12-none/libkern/OSAtomicQueue.h
+++ b/lib/libc/include/aarch64-macos.12-none/libkern/OSAtomicQueue.h
--- a/lib/libc/include/aarch64-macos.12-none/libkern/OSSpinLockDeprecated.h
+++ b/lib/libc/include/aarch64-macos.12-none/libkern/OSSpinLockDeprecated.h
--- a/lib/libc/include/aarch64-macos.12-none/libkern/arm/OSByteOrder.h
+++ b/lib/libc/include/aarch64-macos.12-none/libkern/arm/OSByteOrder.h
--- a/lib/libc/include/aarch64-macos.12-none/mach/arm/_structs.h
+++ b/lib/libc/include/aarch64-macos.12-none/mach/arm/_structs.h
--- a/lib/libc/include/aarch64-macos.12-none/mach/arm/boolean.h
+++ b/lib/libc/include/aarch64-macos.12-none/mach/arm/boolean.h
--- a/lib/libc/include/aarch64-macos.12-none/mach/arm/exception.h
+++ b/lib/libc/include/aarch64-macos.12-none/mach/arm/exception.h
--- a/lib/libc/include/aarch64-macos.12-none/mach/arm/kern_return.h
+++ b/lib/libc/include/aarch64-macos.12-none/mach/arm/kern_return.h
--- a/lib/libc/include/aarch64-macos.12-none/mach/arm/processor_info.h
+++ b/lib/libc/include/aarch64-macos.12-none/mach/arm/processor_info.h
--- a/lib/libc/include/aarch64-macos.12-none/mach/arm/rpc.h
+++ b/lib/libc/include/aarch64-macos.12-none/mach/arm/rpc.h
--- a/lib/libc/include/aarch64-macos.12-none/mach/arm/thread_state.h
+++ b/lib/libc/include/aarch64-macos.12-none/mach/arm/thread_state.h
--- a/lib/libc/include/aarch64-macos.12-none/mach/arm/thread_status.h
+++ b/lib/libc/include/aarch64-macos.12-none/mach/arm/thread_status.h
--- a/lib/libc/include/aarch64-macos.12-none/mach/arm/vm_param.h
+++ b/lib/libc/include/aarch64-macos.12-none/mach/arm/vm_param.h
--- a/lib/libc/include/aarch64-macos.12-none/mach/arm/vm_types.h
+++ b/lib/libc/include/aarch64-macos.12-none/mach/arm/vm_types.h
--- a/lib/libc/include/x86_64-macos.10-none/Availability.h
+++ b/lib/libc/include/x86_64-macos.10-none/Availability.h
--- a/lib/libc/include/x86_64-macos.10-none/AvailabilityInternal.h
+++ b/lib/libc/include/x86_64-macos.10-none/AvailabilityInternal.h
--- a/lib/libc/include/x86_64-macos.10-none/AvailabilityMacros.h
+++ b/lib/libc/include/x86_64-macos.10-none/AvailabilityMacros.h
--- a/lib/libc/include/x86_64-macos.10-none/TargetConditionals.h
+++ b/lib/libc/include/x86_64-macos.10-none/TargetConditionals.h
--- a/lib/libc/include/x86_64-macos.10-none/_ctermid.h
+++ b/lib/libc/include/x86_64-macos.10-none/_ctermid.h
--- a/lib/libc/include/x86_64-macos.10-none/bsm/audit.h
+++ b/lib/libc/include/x86_64-macos.10-none/bsm/audit.h
--- a/lib/libc/include/x86_64-macos.10-none/dispatch/block.h
+++ b/lib/libc/include/x86_64-macos.10-none/dispatch/block.h
--- a/lib/libc/include/x86_64-macos.10-none/dispatch/dispatch.h
+++ b/lib/libc/include/x86_64-macos.10-none/dispatch/dispatch.h
--- a/lib/libc/include/x86_64-macos.10-none/dispatch/group.h
+++ b/lib/libc/include/x86_64-macos.10-none/dispatch/group.h
--- a/lib/libc/include/x86_64-macos.10-none/dispatch/object.h
+++ b/lib/libc/include/x86_64-macos.10-none/dispatch/object.h
--- a/lib/libc/include/x86_64-macos.10-none/dispatch/queue.h
+++ b/lib/libc/include/x86_64-macos.10-none/dispatch/queue.h
--- a/lib/libc/include/x86_64-macos.10-none/dispatch/semaphore.h
+++ b/lib/libc/include/x86_64-macos.10-none/dispatch/semaphore.h
--- a/lib/libc/include/x86_64-macos.10-none/dispatch/source.h
+++ b/lib/libc/include/x86_64-macos.10-none/dispatch/source.h
--- a/lib/libc/include/x86_64-macos.10-none/dispatch/workloop.h
+++ b/lib/libc/include/x86_64-macos.10-none/dispatch/workloop.h
--- a/lib/libc/include/x86_64-macos.10-none/i386/_limits.h
+++ b/lib/libc/include/x86_64-macos.10-none/i386/_limits.h
--- a/lib/libc/include/x86_64-macos.10-none/i386/_mcontext.h
+++ b/lib/libc/include/x86_64-macos.10-none/i386/_mcontext.h
--- a/lib/libc/include/x86_64-macos.10-none/i386/_param.h
+++ b/lib/libc/include/x86_64-macos.10-none/i386/_param.h
--- a/lib/libc/include/x86_64-macos.10-none/i386/_types.h
+++ b/lib/libc/include/x86_64-macos.10-none/i386/_types.h
--- a/lib/libc/include/x86_64-macos.10-none/i386/eflags.h
+++ b/lib/libc/include/x86_64-macos.10-none/i386/eflags.h
--- a/lib/libc/include/x86_64-macos.10-none/i386/endian.h
+++ b/lib/libc/include/x86_64-macos.10-none/i386/endian.h
--- a/lib/libc/include/x86_64-macos.10-none/i386/limits.h
+++ b/lib/libc/include/x86_64-macos.10-none/i386/limits.h
--- a/lib/libc/include/x86_64-macos.10-none/i386/param.h
+++ b/lib/libc/include/x86_64-macos.10-none/i386/param.h
--- a/lib/libc/include/x86_64-macos.10-none/i386/signal.h
+++ b/lib/libc/include/x86_64-macos.10-none/i386/signal.h
--- a/lib/libc/include/x86_64-macos.10-none/i386/types.h
+++ b/lib/libc/include/x86_64-macos.10-none/i386/types.h
--- a/lib/libc/include/x86_64-macos.10-none/libkern/OSAtomic.h
+++ b/lib/libc/include/x86_64-macos.10-none/libkern/OSAtomic.h
--- a/lib/libc/include/x86_64-macos.10-none/libkern/OSAtomicDeprecated.h
+++ b/lib/libc/include/x86_64-macos.10-none/libkern/OSAtomicDeprecated.h
--- a/lib/libc/include/x86_64-macos.10-none/libkern/OSAtomicQueue.h
+++ b/lib/libc/include/x86_64-macos.10-none/libkern/OSAtomicQueue.h
--- a/lib/libc/include/x86_64-macos.10-none/libkern/OSByteOrder.h
+++ b/lib/libc/include/x86_64-macos.10-none/libkern/OSByteOrder.h
--- a/lib/libc/include/x86_64-macos.10-none/libkern/OSSpinLockDeprecated.h
+++ b/lib/libc/include/x86_64-macos.10-none/libkern/OSSpinLockDeprecated.h
--- a/lib/libc/include/x86_64-macos.10-none/libkern/_OSByteOrder.h
+++ b/lib/libc/include/x86_64-macos.10-none/libkern/_OSByteOrder.h
--- a/lib/libc/include/x86_64-macos.10-none/libkern/i386/OSByteOrder.h
+++ b/lib/libc/include/x86_64-macos.10-none/libkern/i386/OSByteOrder.h
--- a/lib/libc/include/x86_64-macos.10-none/libkern/i386/_OSByteOrder.h
+++ b/lib/libc/include/x86_64-macos.10-none/libkern/i386/_OSByteOrder.h
--- a/lib/libc/include/x86_64-macos.10-none/libproc.h
+++ b/lib/libc/include/x86_64-macos.10-none/libproc.h
--- a/lib/libc/include/x86_64-macos.10-none/mach-o/compact_unwind_encoding.h
+++ b/lib/libc/include/x86_64-macos.10-none/mach-o/compact_unwind_encoding.h
--- a/lib/libc/include/x86_64-macos.10-none/mach-o/dyld.h
+++ b/lib/libc/include/x86_64-macos.10-none/mach-o/dyld.h
--- a/lib/libc/include/x86_64-macos.10-none/mach-o/loader.h
+++ b/lib/libc/include/x86_64-macos.10-none/mach-o/loader.h
--- a/lib/libc/include/x86_64-macos.10-none/mach/exception_types.h
+++ b/lib/libc/include/x86_64-macos.10-none/mach/exception_types.h
--- a/lib/libc/include/x86_64-macos.10-none/mach/host_special_ports.h
+++ b/lib/libc/include/x86_64-macos.10-none/mach/host_special_ports.h
--- a/lib/libc/include/x86_64-macos.10-none/mach/i386/_structs.h
+++ b/lib/libc/include/x86_64-macos.10-none/mach/i386/_structs.h
--- a/lib/libc/include/x86_64-macos.10-none/mach/i386/boolean.h
+++ b/lib/libc/include/x86_64-macos.10-none/mach/i386/boolean.h
--- a/lib/libc/include/x86_64-macos.10-none/mach/i386/exception.h
+++ b/lib/libc/include/x86_64-macos.10-none/mach/i386/exception.h
--- a/lib/libc/include/x86_64-macos.10-none/mach/i386/fp_reg.h
+++ b/lib/libc/include/x86_64-macos.10-none/mach/i386/fp_reg.h
--- a/lib/libc/include/x86_64-macos.10-none/mach/i386/kern_return.h
+++ b/lib/libc/include/x86_64-macos.10-none/mach/i386/kern_return.h
--- a/lib/libc/include/x86_64-macos.10-none/mach/i386/processor_info.h
+++ b/lib/libc/include/x86_64-macos.10-none/mach/i386/processor_info.h
--- a/lib/libc/include/x86_64-macos.10-none/mach/i386/rpc.h
+++ b/lib/libc/include/x86_64-macos.10-none/mach/i386/rpc.h
--- a/lib/libc/include/x86_64-macos.10-none/mach/i386/thread_state.h
+++ b/lib/libc/include/x86_64-macos.10-none/mach/i386/thread_state.h
--- a/lib/libc/include/x86_64-macos.10-none/mach/i386/thread_status.h
+++ b/lib/libc/include/x86_64-macos.10-none/mach/i386/thread_status.h
--- a/lib/libc/include/x86_64-macos.10-none/mach/i386/vm_param.h
+++ b/lib/libc/include/x86_64-macos.10-none/mach/i386/vm_param.h
--- a/Show More
+++ b/Show More