diff options
| author | Zixu Wang <9819235+zixu-w@users.noreply.github.com> | 2023-12-08 13:07:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-08 13:07:29 -0800 |
| commit | c9b4bb9ff9b65a741c558bfb93719df95272c2e1 (patch) | |
| tree | 7c0fa4edb722523e419b142f9a214eeb29926c44 | |
| parent | 21213f39e29921c58d0ee25228b4ba5be7324602 (diff) | |
| download | llvm-c9b4bb9ff9b65a741c558bfb93719df95272c2e1.zip llvm-c9b4bb9ff9b65a741c558bfb93719df95272c2e1.tar.gz llvm-c9b4bb9ff9b65a741c558bfb93719df95272c2e1.tar.bz2 | |
[Fix] Disable fdefine-target-os-macros for now (#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.
| -rw-r--r-- | clang/lib/Driver/ToolChains/Darwin.cpp | 4 | ||||
| -rw-r--r-- | 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 d3005d6..f09bc27 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 d7379dd..030d4ce 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 \ |