Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/trusted/service_runtime/build.scons
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ if (env.Bit('linux') and not env.Bit('built_elsewhere')):
elif env.Bit('build_arm'):
ld_emul = 'armelf_linux_eabi'
reserve_top = '0x40002000'
compiler_override = '--compiler arm-linux-gnueabihf-gcc'
compiler_override = '--compiler arm-linux-gnueabihf-g++'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For reference this is done in CMake since maybe more than a year.

elif env.Bit('build_mips32'):
ld_emul = 'elf32ltsmip'
reserve_top = '0x40008000'
Expand Down
13 changes: 9 additions & 4 deletions src/trusted/service_runtime/linux/ld_bfd.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,15 @@ def main(args):
else:
cxx_bin = os.getenv('CXX', 'g++')

args = [FindLDBFD(cxx_bin)] + args
libgcc = FindLibgcc(cxx_bin)
if libgcc is not None:
args.append(libgcc)
if 0:
args = [FindLDBFD(cxx_bin)] + args
libgcc = FindLibgcc(cxx_bin)
if libgcc is not None:
args.append(libgcc)
else:
assert cxx_bin.endswith("g++")
ld = cxx_bin[:-3] + "ld.bfd"
args = [ld] + args
return subprocess.call(args)

if __name__ == "__main__":
Expand Down