Skip to content

Commit 72de458

Browse files
jansvoboda11jansvoboda11
committed
[llvm][clang] Work around older Windows SDK not working with conforming preprocessor
rdar://113996252
1 parent 2fc3863 commit 72de458

File tree

38 files changed

+554
-133
lines changed

38 files changed

+554
-133
lines changed

‎clang/include/clang/Driver/Options.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ enum ClangFlags {
3838

3939
enum ID {
4040
OPT_INVALID = 0, // This is not an option ID.
41-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
41+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
42+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
43+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
44+
FLAGS, PARAM, HELP, METAVAR, VALUES),
4245
#include "clang/Driver/Options.inc"
4346
LastOption
4447
#undef OPTION

‎clang/lib/Driver/DriverOptions.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ using namespace llvm::opt;
2121
#undef PREFIX
2222

2323
static const OptTable::Info InfoTable[] = {
24-
#define OPTION(...) LLVM_CONSTRUCT_OPT_INFO(__VA_ARGS__),
24+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
25+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
26+
LLVM_CONSTRUCT_OPT_INFO(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, \
27+
ALIASARGS, FLAGS, PARAM, HELP, METAVAR, VALUES),
2528
#include "clang/Driver/Options.inc"
2629
#undef OPTION
2730
};

‎clang/lib/Frontend/CompilerInvocation.cpp

Lines changed: 260 additions & 52 deletions
Large diffs are not rendered by default.

‎clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ enum WrapperFlags {
112112

113113
enum ID {
114114
OPT_INVALID = 0, // This is not an option ID.
115-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
115+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
116+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
117+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
118+
FLAGS, PARAM, HELP, METAVAR, VALUES),
116119
#include "LinkerWrapperOpts.inc"
117120
LastOption
118121
#undef OPTION
@@ -123,7 +126,10 @@ enum ID {
123126
#undef PREFIX
124127

125128
static const OptTable::Info InfoTable[] = {
126-
#define OPTION(...) LLVM_CONSTRUCT_OPT_INFO(__VA_ARGS__),
129+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
130+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
131+
LLVM_CONSTRUCT_OPT_INFO(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, \
132+
ALIASARGS, FLAGS, PARAM, HELP, METAVAR, VALUES),
127133
#include "LinkerWrapperOpts.inc"
128134
#undef OPTION
129135
};

‎lld/COFF/Driver.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,10 @@ MemoryBufferRef convertResToCOFF(ArrayRef<MemoryBufferRef> mbs,
230230
// Create enum with OPT_xxx values for each option in Options.td
231231
enum {
232232
OPT_INVALID = 0,
233-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
233+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
234+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
235+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
236+
FLAGS, PARAM, HELP, METAVAR, VALUES),
234237
#include "Options.inc"
235238
#undef OPTION
236239
};

‎lld/COFF/DriverUtils.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,10 @@ MemoryBufferRef convertResToCOFF(ArrayRef<MemoryBufferRef> mbs,
778778

779779
// Create table mapping all options defined in Options.td
780780
static const llvm::opt::OptTable::Info infoTable[] = {
781-
#define OPTION(...) LLVM_CONSTRUCT_OPT_INFO(__VA_ARGS__),
781+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
782+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
783+
LLVM_CONSTRUCT_OPT_INFO(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, \
784+
ALIASARGS, FLAGS, PARAM, HELP, METAVAR, VALUES),
782785
#include "Options.inc"
783786
#undef OPTION
784787
};

‎lld/ELF/Driver.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ class ELFOptTable : public llvm::opt::OptTable {
2525
// Create enum with OPT_xxx values for each option in Options.td
2626
enum {
2727
OPT_INVALID = 0,
28-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
28+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
29+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
30+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
31+
FLAGS, PARAM, HELP, METAVAR, VALUES),
2932
#include "Options.inc"
3033
#undef OPTION
3134
};

‎lld/ELF/DriverUtils.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ using namespace lld::elf;
4040

4141
// Create table mapping all options defined in Options.td
4242
static const opt::OptTable::Info optInfo[] = {
43-
#define OPTION(...) LLVM_CONSTRUCT_OPT_INFO(__VA_ARGS__),
43+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
44+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
45+
LLVM_CONSTRUCT_OPT_INFO(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, \
46+
ALIASARGS, FLAGS, PARAM, HELP, METAVAR, VALUES),
4447
#include "Options.inc"
4548
#undef OPTION
4649
};

‎lld/MachO/Driver.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ class MachOOptTable : public llvm::opt::OptTable {
3535
// Create enum with OPT_xxx values for each option in Options.td
3636
enum {
3737
OPT_INVALID = 0,
38-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
38+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
39+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
40+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
41+
FLAGS, PARAM, HELP, METAVAR, VALUES),
3942
#include "Options.inc"
4043
#undef OPTION
4144
};

‎lld/MinGW/Driver.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ using namespace llvm;
5555
// Create OptTable
5656
enum {
5757
OPT_INVALID = 0,
58-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
58+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
59+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
60+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
61+
FLAGS, PARAM, HELP, METAVAR, VALUES),
5962
#include "Options.inc"
6063
#undef OPTION
6164
};

‎lld/wasm/Driver.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ namespace {
4949
// Create enum with OPT_xxx values for each option in Options.td
5050
enum {
5151
OPT_INVALID = 0,
52-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
52+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
53+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
54+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
55+
FLAGS, PARAM, HELP, METAVAR, VALUES),
5356
#include "Options.inc"
5457
#undef OPTION
5558
};

‎lldb/tools/driver/Driver.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ using namespace llvm;
5252
namespace {
5353
enum ID {
5454
OPT_INVALID = 0, // This is not an option ID.
55-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
55+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
56+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
57+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
58+
FLAGS, PARAM, HELP, METAVAR, VALUES),
5659
#include "Options.inc"
5760
#undef OPTION
5861
};
@@ -62,7 +65,10 @@ enum ID {
6265
#undef PREFIX
6366

6467
const opt::OptTable::Info InfoTable[] = {
65-
#define OPTION(...) LLVM_CONSTRUCT_OPT_INFO(__VA_ARGS__),
68+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
69+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
70+
LLVM_CONSTRUCT_OPT_INFO(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, \
71+
ALIASARGS, FLAGS, PARAM, HELP, METAVAR, VALUES),
6672
#include "Options.inc"
6773
#undef OPTION
6874
};

‎lldb/tools/lldb-server/lldb-gdbserver.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,10 @@ void ConnectToRemote(MainLoop &mainloop,
271271
namespace {
272272
enum ID {
273273
OPT_INVALID = 0, // This is not an option ID.
274-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
274+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
275+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
276+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
277+
FLAGS, PARAM, HELP, METAVAR, VALUES),
275278
#include "LLGSOptions.inc"
276279
#undef OPTION
277280
};
@@ -281,7 +284,10 @@ enum ID {
281284
#undef PREFIX
282285

283286
const opt::OptTable::Info InfoTable[] = {
284-
#define OPTION(...) LLVM_CONSTRUCT_OPT_INFO(__VA_ARGS__),
287+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
288+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
289+
LLVM_CONSTRUCT_OPT_INFO(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, \
290+
ALIASARGS, FLAGS, PARAM, HELP, METAVAR, VALUES),
285291
#include "LLGSOptions.inc"
286292
#undef OPTION
287293
};

‎lldb/tools/lldb-vscode/lldb-vscode.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ using namespace lldb_vscode;
7373
namespace {
7474
enum ID {
7575
OPT_INVALID = 0, // This is not an option ID.
76-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
76+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
77+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
78+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
79+
FLAGS, PARAM, HELP, METAVAR, VALUES),
7780
#include "Options.inc"
7881
#undef OPTION
7982
};
@@ -83,7 +86,10 @@ enum ID {
8386
#undef PREFIX
8487

8588
static const llvm::opt::OptTable::Info InfoTable[] = {
86-
#define OPTION(...) LLVM_CONSTRUCT_OPT_INFO(__VA_ARGS__),
89+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
90+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
91+
LLVM_CONSTRUCT_OPT_INFO(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, \
92+
ALIASARGS, FLAGS, PARAM, HELP, METAVAR, VALUES),
8793
#include "Options.inc"
8894
#undef OPTION
8995
};

‎llvm/cmake/modules/HandleLLVMOptions.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -485,10 +485,6 @@ if( MSVC )
485485

486486
append("/Zc:inline" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
487487

488-
# Enable standards-conforming preprocessor.
489-
# https://learn.microsoft.com/en-us/cpp/build/reference/zc-preprocessor
490-
append("/Zc:preprocessor" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
491-
492488
# Some projects use the __cplusplus preprocessor macro to check support for
493489
# a particular version of the C++ standard. When this option is not specified
494490
# explicitly, macro's value is "199711L" that implies C++98 Standard.

‎llvm/lib/ExecutionEngine/JITLink/COFFDirectiveParser.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ using namespace jitlink;
2424

2525
// Create table mapping all options defined in COFFOptions.td
2626
static const opt::OptTable::Info infoTable[] = {
27-
#define OPTION(...) \
28-
LLVM_CONSTRUCT_OPT_INFO_WITH_ID_PREFIX(COFF_OPT_, __VA_ARGS__),
27+
#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
28+
HELPTEXT, METAVAR, VALUES) \
29+
LLVM_CONSTRUCT_OPT_INFO_WITH_ID_PREFIX(COFF_OPT_, PREFIX, NAME, ID, KIND, \
30+
GROUP, ALIAS, ALIASARGS, FLAGS, \
31+
PARAM, HELPTEXT, METAVAR, VALUES),
2932
#include "COFFOptions.inc"
3033
#undef OPTION
3134
};

‎llvm/lib/ExecutionEngine/JITLink/COFFDirectiveParser.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ namespace jitlink {
2626

2727
enum {
2828
COFF_OPT_INVALID = 0,
29-
#define OPTION(...) LLVM_MAKE_OPT_ID_WITH_ID_PREFIX(COFF_OPT_, __VA_ARGS__),
29+
#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
30+
HELPTEXT, METAVAR, VALUES) \
31+
LLVM_MAKE_OPT_ID_WITH_ID_PREFIX(COFF_OPT_, PREFIX, NAME, ID, KIND, GROUP, \
32+
ALIAS, ALIASARGS, FLAGS, PARAM, HELPTEXT, \
33+
METAVAR, VALUES),
3034
#include "COFFOptions.inc"
3135
#undef OPTION
3236
};

‎llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ namespace {
3333

3434
enum {
3535
OPT_INVALID = 0,
36-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
36+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
37+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
38+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
39+
FLAGS, PARAM, HELP, METAVAR, VALUES),
3740
#include "Options.inc"
3841
#undef OPTION
3942
};
@@ -43,7 +46,10 @@ enum {
4346
#undef PREFIX
4447

4548
static const llvm::opt::OptTable::Info InfoTable[] = {
46-
#define OPTION(...) LLVM_CONSTRUCT_OPT_INFO(__VA_ARGS__),
49+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
50+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
51+
LLVM_CONSTRUCT_OPT_INFO(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, \
52+
ALIASARGS, FLAGS, PARAM, HELP, METAVAR, VALUES),
4753
#include "Options.inc"
4854
#undef OPTION
4955
};

‎llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ namespace {
3636

3737
enum {
3838
OPT_INVALID = 0,
39-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
39+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
40+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
41+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
42+
FLAGS, PARAM, HELP, METAVAR, VALUES),
4043
#include "Options.inc"
4144
#undef OPTION
4245
};
@@ -46,7 +49,10 @@ enum {
4649
#undef PREFIX
4750

4851
static const opt::OptTable::Info InfoTable[] = {
49-
#define OPTION(...) LLVM_CONSTRUCT_OPT_INFO(__VA_ARGS__),
52+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
53+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
54+
LLVM_CONSTRUCT_OPT_INFO(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, \
55+
ALIASARGS, FLAGS, PARAM, HELP, METAVAR, VALUES),
5056
#include "Options.inc"
5157
#undef OPTION
5258
};

‎llvm/tools/dsymutil/dsymutil.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ using namespace object;
5757
namespace {
5858
enum ID {
5959
OPT_INVALID = 0, // This is not an option ID.
60-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
60+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
61+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
62+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
63+
FLAGS, PARAM, HELP, METAVAR, VALUES),
6164
#include "Options.inc"
6265
#undef OPTION
6366
};
@@ -67,7 +70,10 @@ enum ID {
6770
#undef PREFIX
6871

6972
const opt::OptTable::Info InfoTable[] = {
70-
#define OPTION(...) LLVM_CONSTRUCT_OPT_INFO(__VA_ARGS__),
73+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
74+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
75+
LLVM_CONSTRUCT_OPT_INFO(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, \
76+
ALIASARGS, FLAGS, PARAM, HELP, METAVAR, VALUES),
7177
#include "Options.inc"
7278
#undef OPTION
7379
};

‎llvm/tools/llvm-cvtres/llvm-cvtres.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ namespace {
3737

3838
enum ID {
3939
OPT_INVALID = 0, // This is not an option ID.
40-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
40+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
41+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
42+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
43+
FLAGS, PARAM, HELP, METAVAR, VALUES),
4144
#include "Opts.inc"
4245
#undef OPTION
4346
};
@@ -47,7 +50,10 @@ enum ID {
4750
#undef PREFIX
4851

4952
const opt::OptTable::Info InfoTable[] = {
50-
#define OPTION(...) LLVM_CONSTRUCT_OPT_INFO(__VA_ARGS__),
53+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
54+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
55+
LLVM_CONSTRUCT_OPT_INFO(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, \
56+
ALIASARGS, FLAGS, PARAM, HELP, METAVAR, VALUES),
5157
#include "Opts.inc"
5258
#undef OPTION
5359
};

‎llvm/tools/llvm-cxxfilt/llvm-cxxfilt.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ using namespace llvm;
2525
namespace {
2626
enum ID {
2727
OPT_INVALID = 0, // This is not an option ID.
28-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
28+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
29+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
30+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
31+
FLAGS, PARAM, HELP, METAVAR, VALUES),
2932
#include "Opts.inc"
3033
#undef OPTION
3134
};
@@ -35,7 +38,10 @@ enum ID {
3538
#undef PREFIX
3639

3740
const opt::OptTable::Info InfoTable[] = {
38-
#define OPTION(...) LLVM_CONSTRUCT_OPT_INFO(__VA_ARGS__),
41+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
42+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
43+
LLVM_CONSTRUCT_OPT_INFO(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, \
44+
ALIASARGS, FLAGS, PARAM, HELP, METAVAR, VALUES),
3945
#include "Opts.inc"
4046
#undef OPTION
4147
};

‎llvm/tools/llvm-dwarfutil/llvm-dwarfutil.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ using namespace object;
3333
namespace {
3434
enum ID {
3535
OPT_INVALID = 0, // This is not an option ID.
36-
#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
36+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
37+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
38+
LLVM_MAKE_OPT_ID(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
39+
FLAGS, PARAM, HELP, METAVAR, VALUES),
3740
#include "Options.inc"
3841
#undef OPTION
3942
};
@@ -43,7 +46,10 @@ enum ID {
4346
#undef PREFIX
4447

4548
const opt::OptTable::Info InfoTable[] = {
46-
#define OPTION(...) LLVM_CONSTRUCT_OPT_INFO(__VA_ARGS__),
49+
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
50+
FLAGS, PARAM, HELP, METAVAR, VALUES) \
51+
LLVM_CONSTRUCT_OPT_INFO(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, \
52+
ALIASARGS, FLAGS, PARAM, HELP, METAVAR, VALUES),
4753
#include "Options.inc"
4854
#undef OPTION
4955
};

0 commit comments

Comments
 (0)