maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ELF] - Change the way how we compute offsets for binary output. 

Binary output feature is a bit confuzing. bfd and gold output differs a lot sometimes,
though it is important for FreeBSD mbr loaders.

Patch change the way how we compute file offsets for binary output.
This fixes PR31196.

Previously offsets were calculated basing on offsets and addresses of sections
from the same loads:
if (Sec == First)
  return alignTo(Off, Target->MaxPageSize, Sec->Addr);
return First->Offset + Sec->Addr - First->Addr;

bfd assigns offsets for each section to VA - MinVA:
https://github.com/redox-os/binutils-gdb/blob/master/bfd/binary.c#L27
https://github.com/redox-os/binutils-gdb/blob/master/bfd/binary.c#L255 
(LMA == VA usually)

This patch for now just stops creating phdrs for binary output. 
An effect from this that no any additional calculation for offset is performed:

uintX_t getFileAlignment(uintX_t Off, OutputSectionBase *Sec) {
OutputSectionBase *First = Sec->FirstInPtLoad;
// If the section is not in a PT_LOAD, we have no other constraint.
if (!First)
  return Off; //**First is always null, condition always happens**

That is enough now with combination of another patch to generate output
that is similar to what bfd produce for mbr loader.

Differential revision: https://reviews.llvm.org/D27341

llvm-svn: 288580
This commit is contained in:
George Rimar 2016-12-03 07:23:30 +00:00
parent d250618c3e
commit 40c28c7f9a
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lld/ELF/Writer.cpp
View File

@ -180,10 +180,15 @@ template <class ELFT> void Writer<ELFT>::run() {
if (Config->Relocatable) {
assignFileOffsets();
} else {
Phdrs = Script<ELFT>::X->hasPhdrsCommands() ? Script<ELFT>::X->createPhdrs()
: createPhdrs();
addPtArmExid(Phdrs);
fixHeaders();
// Binary output does not have PHDRS.
if (!Config->OFormatBinary) {
Phdrs = Script<ELFT>::X->hasPhdrsCommands()
? Script<ELFT>::X->createPhdrs()
: createPhdrs();
addPtArmExid(Phdrs);
fixHeaders();
}
if (ScriptConfig->HasSections) {
Script<ELFT>::X->assignAddresses(Phdrs);
} else {

18
lld/test/ELF/oformat-binary-ttext.s Normal file
View File

@ -0,0 +1,18 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
# RUN: ld.lld -N -Ttext 0x100 -o %t.out %t --oformat binary
# RUN: od -t x1 -v %t.out | FileCheck %s --check-prefix=BIN
# BIN: 0000000 90 00 00 00 00 00 00 00
# BIN-NEXT: 0000010
# BIN-NOT: 0000020
## The same but without OMAGIC.
# RUN: ld.lld -Ttext 0x100 -o %t.out %t --oformat binary
# RUN: od -t x1 -v %t.out | FileCheck %s --check-prefix=BIN
.text
.globl _start
_start:
nop