Skip to content

Commit 2da9314

Browse files
quic-seaswaraquic-seaswara
committed
fix break with llvm tip
this is for unblocking eld upstream : llvm/llvm-project#155026 Signed-off-by: Shankar Easwaran <[email protected]>
1 parent bdf48c1 commit 2da9314

File tree

10 files changed

+15
-15
lines changed

10 files changed

+15
-15
lines changed

‎include/eld/Driver/ARMLinkDriver.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class OPT_ARMLinkOptTable : public llvm::opt::GenericOptTable {
2525
INVALID = 0,
2626
#define OPTION(PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, \
2727
ALIASARGS, FLAGS, VISIBILITY, PARAM, HELPTEXT, \
28-
HELPTEXTSFORVARIANTS, METAVAR, VALUES) \
28+
HELPTEXTSFORVARIANTS, METAVAR, VALUES, SUBCOMMANDIDS_OFFSET) \
2929
ID,
3030
#include "eld/Driver/ARMLinkerOptions.inc"
3131
#undef OPTION

‎include/eld/Driver/GnuLdDriver.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class OPT_GnuLdOptTable : public llvm::opt::GenericOptTable {
4040
INVALID = 0,
4141
#define OPTION(PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, \
4242
ALIASARGS, FLAGS, VISIBILITY, PARAM, HELPTEXT, \
43-
HELPTEXTSFORVARIANTS, METAVAR, VALUES) \
43+
HELPTEXTSFORVARIANTS, METAVAR, VALUES, SUBCOMMANDIDS_OFFSET) \
4444
ID,
4545
#include "eld/Driver/GnuLinkerOptions.inc"
4646
#undef OPTION

‎include/eld/Driver/HexagonLinkDriver.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class OPT_HexagonLinkOptTable : public llvm::opt::GenericOptTable {
2121
INVALID = 0,
2222
#define OPTION(PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, \
2323
ALIASARGS, FLAGS, VISIBILITY, PARAM, HELPTEXT, \
24-
HELPTEXTSFORVARIANTS, METAVAR, VALUES) \
24+
HELPTEXTSFORVARIANTS, METAVAR, VALUES, SUBCOMMANDIDS_OFFSET) \
2525
ID,
2626
#include "eld/Driver/HexagonLinkerOptions.inc"
2727
#undef OPTION

‎include/eld/Driver/RISCVLinkDriver.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class OPT_RISCVLinkOptTable : public llvm::opt::GenericOptTable {
2020
INVALID = 0,
2121
#define OPTION(PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, \
2222
ALIASARGS, FLAGS, VISIBILITY, PARAM, HELPTEXT, \
23-
HELPTEXTSFORVARIANTS, METAVAR, VALUES) \
23+
HELPTEXTSFORVARIANTS, METAVAR, VALUES, SUBCOMMANDIDS_OFFSET) \
2424
ID,
2525
#include "eld/Driver/RISCVLinkerOptions.inc"
2626
#undef OPTION

‎include/eld/Driver/x86_64LinkDriver.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class OPT_x86_64LinkOptTable : public llvm::opt::GenericOptTable {
2222
INVALID = 0,
2323
#define OPTION(PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, \
2424
ALIASARGS, FLAGS, VISIBILITY, PARAM, HELPTEXT, \
25-
HELPTEXTSFORVARIANTS, METAVAR, VALUES) \
25+
HELPTEXTSFORVARIANTS, METAVAR, VALUES, SUBCOMMANDIDS_OFFSET) \
2626
ID,
2727
#include "eld/Driver/x86_64LinkerOptions.inc"
2828
#undef OPTION

‎lib/LinkerWrapper/ARMLinkDriver.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ using namespace eld;
3232
static constexpr llvm::opt::OptTable::Info infoTable[] = {
3333
#define OPTION(PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, \
3434
ALIASARGS, FLAGS, VISIBILITY, PARAM, HELPTEXT, \
35-
HELPTEXTSFORVARIANTS, METAVAR, VALUES) \
35+
HELPTEXTSFORVARIANTS, METAVAR, VALUES, SUBCOMMANDIDS_OFFSET) \
3636
LLVM_CONSTRUCT_OPT_INFO( \
3737
PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ARMLinkOptTable::ID, KIND, \
3838
ARMLinkOptTable::GROUP, ARMLinkOptTable::ALIAS, ALIASARGS, FLAGS, \
39-
VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, VALUES),
39+
VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, VALUES, SUBCOMMANDIDS_OFFSET),
4040
#include "eld/Driver/ARMLinkerOptions.inc"
4141
#undef OPTION
4242
};

‎lib/LinkerWrapper/GnuLdDriver.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ using namespace eld;
5959
static constexpr llvm::opt::OptTable::Info infoTable[] = {
6060
#define OPTION(PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, \
6161
ALIASARGS, FLAGS, VISIBILITY, PARAM, HELPTEXT, \
62-
HELPTEXTSFORVARIANTS, METAVAR, VALUES) \
62+
HELPTEXTSFORVARIANTS, METAVAR, VALUES, SUBCOMMANDIDS_OFFSET) \
6363
LLVM_CONSTRUCT_OPT_INFO( \
6464
PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, GnuLdOptTable::ID, KIND, \
6565
GnuLdOptTable::GROUP, GnuLdOptTable::ALIAS, ALIASARGS, FLAGS, \
66-
VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, VALUES),
66+
VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, VALUES, SUBCOMMANDIDS_OFFSET),
6767
#include "eld/Driver/GnuLinkerOptions.inc"
6868
#undef OPTION
6969
};

‎lib/LinkerWrapper/HexagonLinkDriver.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ using namespace llvm::opt;
3232
static constexpr llvm::opt::OptTable::Info infoTable[] = {
3333
#define OPTION(PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, \
3434
ALIASARGS, FLAGS, VISIBILITY, PARAM, HELPTEXT, \
35-
HELPTEXTSFORVARIANTS, METAVAR, VALUES) \
35+
HELPTEXTSFORVARIANTS, METAVAR, VALUES, SUBCOMMANDIDS_OFFSET) \
3636
LLVM_CONSTRUCT_OPT_INFO( \
3737
PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, HexagonLinkOptTable::ID, KIND, \
3838
HexagonLinkOptTable::GROUP, HexagonLinkOptTable::ALIAS, ALIASARGS, \
3939
FLAGS, VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, \
40-
VALUES),
40+
VALUES, SUBCOMMANDIDS_OFFSET),
4141
#include "eld/Driver/HexagonLinkerOptions.inc"
4242
#undef OPTION
4343
};

‎lib/LinkerWrapper/RISCVLinkDriver.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ using namespace eld;
3131
static constexpr llvm::opt::OptTable::Info infoTable[] = {
3232
#define OPTION(PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, \
3333
ALIASARGS, FLAGS, VISIBILITY, PARAM, HELPTEXT, \
34-
HELPTEXTSFORVARIANTS, METAVAR, VALUES) \
34+
HELPTEXTSFORVARIANTS, METAVAR, VALUES, SUBCOMMANDIDS_OFFSET) \
3535
LLVM_CONSTRUCT_OPT_INFO( \
3636
PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, RISCVLinkOptTable::ID, KIND, \
3737
RISCVLinkOptTable::GROUP, RISCVLinkOptTable::ALIAS, ALIASARGS, FLAGS, \
38-
VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, VALUES),
38+
VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, VALUES, SUBCOMMANDIDS_OFFSET),
3939
#include "eld/Driver/RISCVLinkerOptions.inc"
4040
#undef OPTION
4141
};

‎lib/LinkerWrapper/x86_64LinkDriver.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ using namespace llvm::opt;
2525
static constexpr llvm::opt::OptTable::Info infoTable[] = {
2626
#define OPTION(PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, \
2727
ALIASARGS, FLAGS, VISIBILITY, PARAM, HELPTEXT, \
28-
HELPTEXTSFORVARIANTS, METAVAR, VALUES) \
28+
HELPTEXTSFORVARIANTS, METAVAR, VALUES, SUBCOMMANDIDS_OFFSET) \
2929
LLVM_CONSTRUCT_OPT_INFO( \
3030
PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, x86_64LinkOptTable::ID, KIND, \
3131
x86_64LinkOptTable::GROUP, x86_64LinkOptTable::ALIAS, ALIASARGS, FLAGS, \
32-
VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, VALUES),
32+
VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, VALUES, SUBCOMMANDIDS_OFFSET),
3333
#include "eld/Driver/x86_64LinkerOptions.inc"
3434
#undef OPTION
3535
};

0 commit comments

Comments
 (0)