Skip to content

Commit dbb77e6

Browse files
committed
Add the -ffixed-r9 flag for ARM.
This patch adds the -ffixed-r9 flag to clang to instruct llvm to globally preserve the contents of r9. The flag is added to the newly created ARM specific group. While at it, also place marm / mno-thumb in that group. Patch by Jeroen Hofstee. llvm-svn: 189174
1 parent 07f383f commit dbb77e6

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

clang/include/clang/Driver/Options.td

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ def clang_i_Group : OptionGroup<"<clang i group>">, Group<i_Group>;
7272
def m_Group : OptionGroup<"<m group>">, Group<CompileOnly_Group>;
7373
def m_x86_Features_Group : OptionGroup<"<m x86 features group>">, Group<m_Group>;
7474
def m_hexagon_Features_Group : OptionGroup<"<m hexagon features group>">, Group<m_Group>;
75+
def m_arm_Features_Group : OptionGroup<"<m arm features group>">, Group<m_Group>;
7576
def opencl_Group : OptionGroup<"<opencl group>">;
7677
def u_Group : OptionGroup<"<u group>">;
7778
def mips_CPUs_Group : OptionGroup<"<MIPS CPU aliases group>">,
@@ -986,8 +987,10 @@ def mno_rtm : Flag<["-"], "mno-rtm">, Group<m_x86_Features_Group>;
986987
def mno_prfchw : Flag<["-"], "mno-prfchw">, Group<m_x86_Features_Group>;
987988
def mno_rdseed : Flag<["-"], "mno-rdseed">, Group<m_x86_Features_Group>;
988989

989-
def mno_thumb : Flag<["-"], "mno-thumb">, Group<m_Group>;
990+
def mno_thumb : Flag<["-"], "mno-thumb">, Group<m_arm_Features_Group>;
990991
def marm : Flag<["-"], "marm">, Alias<mno_thumb>;
992+
def ffixed_r9 : Flag<["-"], "ffixed-r9">, Group<m_arm_Features_Group>,
993+
HelpText<"Reserve the r9 register (ARM only)">;
991994

992995
def mno_warn_nonportable_cfstrings : Flag<["-"], "mno-warn-nonportable-cfstrings">, Group<m_Group>;
993996
def mno_omit_leaf_frame_pointer : Flag<["-"], "mno-omit-leaf-frame-pointer">, Group<m_Group>;

clang/lib/Driver/Tools.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -795,6 +795,14 @@ void Clang::AddARMTargetArgs(const ArgList &Args,
795795
options::OPT_mno_implicit_float,
796796
true))
797797
CmdArgs.push_back("-no-implicit-float");
798+
799+
// llvm does not support reserving registers in general. There is support
800+
// for reserving r9 on ARM though (defined as a platform-specific register
801+
// in ARM EABI).
802+
if (Args.hasArg(options::OPT_ffixed_r9)) {
803+
CmdArgs.push_back("-backend-option");
804+
CmdArgs.push_back("-arm-reserve-r9");
805+
}
798806
}
799807

800808
// Translate MIPS CPU name alias option to CPU name.

0 commit comments

Comments
 (0)