Skip to content

added the commandline flag to not merge sections. #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 2, 2024
Merged

added the commandline flag to not merge sections. #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3be88c3
added the commandline flag to not merge sections. This will keep
CR3Swapper Feb 2, 2024
808ea06
Update Driver.cpp
CR3Swapper Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lld/COFF/Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ struct Configuration {
bool showSummary = false;
bool printSearchPaths = false;
bool enableFullPdbPath = false;
bool dontMergeSections = false;
unsigned debugTypes = static_cast<unsigned>(DebugType::None);
llvm::SmallVector<llvm::StringRef, 0> mllvmOpts;
std::vector<std::string> natvisFiles;
Expand Down
46 changes: 24 additions & 22 deletions lld/COFF/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2026,28 +2026,30 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
for (auto *arg : args.filtered(OPT_merge))
parseMerge(arg->getValue());

// Add default section merging rules after user rules. User rules take
// precedence, but we will emit a warning if there is a conflict.
parseMerge(".idata=.rdata");
parseMerge(".didat=.rdata");
if (!config->driver)
parseMerge(".edata=.rdata");
parseMerge(".xdata=.rdata");
parseMerge(".00cfg=.rdata");

parseMerge(".voltbl=.rdata");
parseMerge("newworld=.rdata");

if (config->driver)
parseMerge("INIT2=INIT");

if (isArm64EC(config->machine))
parseMerge(".wowthk=.text");

if (config->mingw) {
parseMerge(".ctors=.rdata");
parseMerge(".dtors=.rdata");
parseMerge(".CRT=.rdata");
if (!config->dontMergeSections) {
// Add default section merging rules after user rules. User rules take
// precedence, but we will emit a warning if there is a conflict.
parseMerge(".idata=.rdata");
parseMerge(".didat=.rdata");
if (!config->driver)
parseMerge(".edata=.rdata");
parseMerge(".xdata=.rdata");
parseMerge(".00cfg=.rdata");

parseMerge(".voltbl=.rdata");
parseMerge("newworld=.rdata");

if (config->driver)
parseMerge("INIT2=INIT");

if (isArm64EC(config->machine))
parseMerge(".wowthk=.text");

if (config->mingw) {
parseMerge(".ctors=.rdata");
parseMerge(".dtors=.rdata");
parseMerge(".CRT=.rdata");
}
}

// Handle /section
Expand Down
3 changes: 3 additions & 0 deletions lld/COFF/Options.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ multiclass B_priv<string name> {
def _no : F<name#":no">;
}

def dont_merge_sections: F<"dont-merge-sections">,
HelpText<"Each data directory will have its own section">;

def align : P<"align", "Section alignment">;
def aligncomm : P<"aligncomm", "Set common symbol alignment">;
def alternatename : P<"alternatename", "Define weak alias">;
Expand Down