https://github.com/zixu-w created https://github.com/llvm/llvm-project/pull/74886
https://github.com/llvm/llvm-project/pull/74676 landed the work to implement `-fdefine-target-os-macros` and enabled the extension for the Darwin driver. However it is breaking some test builds. Leave the extension disabled for now until we can fix/workaround the build failures. >From 63be986f612c175559efffed9daebcb944fa5cea Mon Sep 17 00:00:00 2001 From: Zixu Wang <zixu_w...@apple.com> Date: Fri, 8 Dec 2023 12:58:15 -0800 Subject: [PATCH] [Fix] Disable fdefine-target-os-macros for now https://github.com/llvm/llvm-project/pull/74676 landed the work to implement `-fdefine-target-os-macros` and enabled the extension for the Darwin driver. However it is breaking some test builds. Leave the extension disabled for now until we can fix/workaround the build failures. --- clang/lib/Driver/ToolChains/Darwin.cpp | 4 --- clang/test/Driver/fdefine-target-os-macros.c | 29 +++++++++++++------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp index d3005d69e92bbf..f09bc27d7d2c0e 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp @@ -2916,10 +2916,6 @@ void Darwin::addClangTargetOptions(const llvm::opt::ArgList &DriverArgs, // to fix the same problem with C++ headers, and is generally fragile. if (!sdkSupportsBuiltinModules(TargetPlatform, SDKInfo)) CC1Args.push_back("-fbuiltin-headers-in-system-modules"); - - if (!DriverArgs.hasArgNoClaim(options::OPT_fdefine_target_os_macros, - options::OPT_fno_define_target_os_macros)) - CC1Args.push_back("-fdefine-target-os-macros"); } void Darwin::addClangCC1ASTargetOptions( diff --git a/clang/test/Driver/fdefine-target-os-macros.c b/clang/test/Driver/fdefine-target-os-macros.c index d7379dd3d5396b..030d4ce34cb282 100644 --- a/clang/test/Driver/fdefine-target-os-macros.c +++ b/clang/test/Driver/fdefine-target-os-macros.c @@ -1,11 +1,12 @@ // RUN: %clang -### --target=arm64-apple-darwin %s 2>&1 | FileCheck %s --check-prefix=DARWIN-DEFAULT -// DARWIN-DEFAULT: "-fdefine-target-os-macros" +// DARWIN-DEFAULT-NOT: "-fdefine-target-os-macros" // RUN: %clang -### --target=arm-none-linux-gnu %s 2>&1 | FileCheck %s --check-prefix=NON-DARWIN-DEFAULT // RUN: %clang -### --target=x86_64-pc-win32 %s 2>&1 | FileCheck %s --check-prefix=NON-DARWIN-DEFAULT // NON-DARWIN-DEFAULT-NOT: "-fdefine-target-os-macros" -// RUN: %clang -dM -E --target=arm64-apple-macos %s 2>&1 \ +// RUN: %clang -dM -E --target=arm64-apple-macos \ +// RUN: -fdefine-target-os-macros %s 2>&1 \ // RUN: | FileCheck %s -DMAC=1 \ // RUN: -DOSX=1 \ // RUN: -DIPHONE=0 \ @@ -20,7 +21,8 @@ // RUN: -DLINUX=0 \ // RUN: -DUNIX=0 -// RUN: %clang -dM -E --target=arm64-apple-ios %s 2>&1 \ +// RUN: %clang -dM -E --target=arm64-apple-ios \ +// RUN: -fdefine-target-os-macros %s 2>&1 \ // RUN: | FileCheck %s -DMAC=1 \ // RUN: -DOSX=0 \ // RUN: -DIPHONE=1 \ @@ -35,7 +37,8 @@ // RUN: -DLINUX=0 \ // RUN: -DUNIX=0 -// RUN: %clang -dM -E --target=arm64-apple-ios-macabi %s 2>&1 \ +// RUN: %clang -dM -E --target=arm64-apple-ios-macabi \ +// RUN: -fdefine-target-os-macros %s 2>&1 \ // RUN: | FileCheck %s -DMAC=1 \ // RUN: -DOSX=0 \ // RUN: -DIPHONE=1 \ @@ -50,7 +53,8 @@ // RUN: -DLINUX=0 \ // RUN: -DUNIX=0 -// RUN: %clang -dM -E --target=arm64-apple-ios-simulator %s 2>&1 \ +// RUN: %clang -dM -E --target=arm64-apple-ios-simulator \ +// RUN: -fdefine-target-os-macros %s 2>&1 \ // RUN: | FileCheck %s -DMAC=1 \ // RUN: -DOSX=0 \ // RUN: -DIPHONE=1 \ @@ -65,7 +69,8 @@ // RUN: -DLINUX=0 \ // RUN: -DUNIX=0 -// RUN: %clang -dM -E --target=arm64-apple-tvos %s 2>&1 \ +// RUN: %clang -dM -E --target=arm64-apple-tvos \ +// RUN: -fdefine-target-os-macros %s 2>&1 \ // RUN: | FileCheck %s -DMAC=1 \ // RUN: -DOSX=0 \ // RUN: -DIPHONE=1 \ @@ -80,7 +85,8 @@ // RUN: -DLINUX=0 \ // RUN: -DUNIX=0 -// RUN: %clang -dM -E --target=arm64-apple-tvos-simulator %s 2>&1 \ +// RUN: %clang -dM -E --target=arm64-apple-tvos-simulator \ +// RUN: -fdefine-target-os-macros %s 2>&1 \ // RUN: | FileCheck %s -DMAC=1 \ // RUN: -DOSX=0 \ // RUN: -DIPHONE=1 \ @@ -95,7 +101,8 @@ // RUN: -DLINUX=0 \ // RUN: -DUNIX=0 -// RUN: %clang -dM -E --target=arm64-apple-watchos %s 2>&1 \ +// RUN: %clang -dM -E --target=arm64-apple-watchos \ +// RUN: -fdefine-target-os-macros %s 2>&1 \ // RUN: | FileCheck %s -DMAC=1 \ // RUN: -DOSX=0 \ // RUN: -DIPHONE=1 \ @@ -110,7 +117,8 @@ // RUN: -DLINUX=0 \ // RUN: -DUNIX=0 -// RUN: %clang -dM -E --target=arm64-apple-watchos-simulator %s 2>&1 \ +// RUN: %clang -dM -E --target=arm64-apple-watchos-simulator \ +// RUN: -fdefine-target-os-macros %s 2>&1 \ // RUN: | FileCheck %s -DMAC=1 \ // RUN: -DOSX=0 \ // RUN: -DIPHONE=1 \ @@ -125,7 +133,8 @@ // RUN: -DLINUX=0 \ // RUN: -DUNIX=0 -// RUN: %clang -dM -E --target=arm64-apple-driverkit %s 2>&1 \ +// RUN: %clang -dM -E --target=arm64-apple-driverkit \ +// RUN: -fdefine-target-os-macros %s 2>&1 \ // RUN: | FileCheck %s -DMAC=1 \ // RUN: -DOSX=0 \ // RUN: -DIPHONE=0 \ _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
