Commit 7a7401f

committed

Merge from 'main' to 'sycl-web' (#1)

CONFLICT (content): Merge conflict in clang/include/clang/Driver/Options.td

2 parents d57ae01 + b6575bf commit 7a7401fCopy full SHA for 7a7401f

5 files changed

+613

-582

lines changed

clang
- include/clang/Driver
  - Options.td
- lib/Frontend
  - CompilerInvocation.cpp
llvm
- include/llvm/Option
  - OptParser.td
- unittests/Option
  - OptionMarshallingTest.cpp
  - Opts.td

+613

-582

lines changed

Comments

(0)