Skip to content

Commit 8b72edd

Browse files
committed
[embedded] Make -mergeable-symbols the default for Embedded Swift
1 parent cca7eb7 commit 8b72edd

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

include/swift/Option/FrontendOptions.td

+4
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,10 @@ def mergeable_symbols : Flag<["-"], "mergeable-symbols">,
783783
Flags<[FrontendOption, NoInteractiveOption, HelpHidden]>,
784784
HelpText<"Emit symbol definitions as mergeable (linkonce_odr)">;
785785

786+
def no_mergeable_symbols : Flag<["-"], "no-mergeable-symbols">,
787+
Flags<[FrontendOption, NoInteractiveOption, HelpHidden]>,
788+
HelpText<"Disable symbol definitions as mergeable (linkonce_odr)">;
789+
786790
def disable_preallocated_instantiation_caches : Flag<["-"], "disable-preallocated-instantiation-caches">,
787791
Flags<[FrontendOption, NoInteractiveOption, HelpHidden]>,
788792
HelpText<"Avoid preallocating metadata instantiation caches in globals">;

lib/Frontend/CompilerInvocation.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -3718,9 +3718,8 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
37183718

37193719
Opts.InternalizeSymbols = FrontendOpts.Static;
37203720

3721-
if (Args.hasArg(OPT_mergeable_symbols)) {
3722-
Opts.MergeableSymbols = true;
3723-
}
3721+
Opts.MergeableSymbols =
3722+
Args.hasFlag(OPT_mergeable_symbols, OPT_no_mergeable_symbols, true);
37243723

37253724
if (Args.hasArg(OPT_disable_preallocated_instantiation_caches)) {
37263725
Opts.NoPreallocatedInstantiationCaches = true;

0 commit comments

Comments
 (0)