Cherry pick -r124899 from llvm root

Just what it says - for ARM/MC/ELF
http://llvm.org/viewvc/llvm-project?view=rev&revision=124899


From: -r124899
Teach ARM/MC/ELF about EF_ARM_EABI_VERSION. The magic number is set to
5 to match the current doc.
Added FIXME reminder Make it really configurable later.

NOTE: 
NaCl requires an special ELF e_flags. So does ARM.
PNaCl lib/MC/ELFObjectwriter.cpp had a @LOCALMOD to deal with the NaCl specific e_flags which conflicted with the necessary update to ARM. This required the merged version to have the @LOCALMOD@ as well to handle both cases.

[robertm, 2011-02-23 15:08:58]

http://codereview.chromium.org/6538110/diff/1/llvm-trunk/lib/MC/ELFObjectWrit...
File llvm-trunk/lib/MC/ELFObjectWriter.cpp (right):

http://codereview.chromium.org/6538110/diff/1/llvm-trunk/lib/MC/ELFObjectWrit...
llvm-trunk/lib/MC/ELFObjectWriter.cpp:281: // @LOCALMOD-BEGIN
I am confused which way are you cherry picking.
Why is there a LOCAMOD here?

[jasonwkim, 2011-02-23 15:28:17]

http://codereview.chromium.org/6538110/diff/1/llvm-trunk/lib/MC/ELFObjectWrit...
File llvm-trunk/lib/MC/ELFObjectWriter.cpp (right):

http://codereview.chromium.org/6538110/diff/1/llvm-trunk/lib/MC/ELFObjectWrit...
llvm-trunk/lib/MC/ELFObjectWriter.cpp:281: // @LOCALMOD-BEGIN
On 2011/02/23 15:08:58, robertm wrote:
> I am confused which way are you cherry picking.
> Why is there a LOCAMOD here

Because our code uses EF_NACL_ALIGN_32 which the upstream doesn't know about,
thus the @LOCALMOD

This code was lifted from line 477 of the PNACL ELFObjectWriter.cpp I am also
merely preserving the localmod that was there

[robertm, 2011-02-23 15:40:00]

Could you add some info to the description.
Maybe indicated that this is not just a cherry
pick but that it also contains local mods.


On 2011/02/23 15:28:17, jasonwkim wrote:
>
http://codereview.chromium.org/6538110/diff/1/llvm-trunk/lib/MC/ELFObjectWrit...
> File llvm-trunk/lib/MC/ELFObjectWriter.cpp (right):
> 
>
http://codereview.chromium.org/6538110/diff/1/llvm-trunk/lib/MC/ELFObjectWrit...
> llvm-trunk/lib/MC/ELFObjectWriter.cpp:281: // @LOCALMOD-BEGIN
> On 2011/02/23 15:08:58, robertm wrote:
> > I am confused which way are you cherry picking.
> > Why is there a LOCAMOD here
> 
> Because our code uses EF_NACL_ALIGN_32 which the upstream doesn't know about,
> thus the @LOCALMOD
> 
> This code was lifted from line 477 of the PNACL ELFObjectWriter.cpp I am also
> merely preserving the localmod that was there

[jasonwkim, 2011-02-23 16:09:58]

On 2011/02/23 15:40:00, robertm wrote:
> Could you add some info to the description.
> Maybe indicated that this is not just a cherry
> pick but that it also contains local mods.

PTAL. 

> 
> 
> On 2011/02/23 15:28:17, jasonwkim wrote:
> >
>
http://codereview.chromium.org/6538110/diff/1/llvm-trunk/lib/MC/ELFObjectWrit...
> > File llvm-trunk/lib/MC/ELFObjectWriter.cpp (right):
> > 
> >
>
http://codereview.chromium.org/6538110/diff/1/llvm-trunk/lib/MC/ELFObjectWrit...
> > llvm-trunk/lib/MC/ELFObjectWriter.cpp:281: // @LOCALMOD-BEGIN
> > On 2011/02/23 15:08:58, robertm wrote:
> > > I am confused which way are you cherry picking.
> > > Why is there a LOCAMOD here
> > 
> > Because our code uses EF_NACL_ALIGN_32 which the upstream doesn't know
about,
> > thus the @LOCALMOD
> > 
> > This code was lifted from line 477 of the PNACL ELFObjectWriter.cpp I am
also
> > merely preserving the localmod that was there

[robertm, 2011-02-23 16:15:14]

LGTM

On 2011/02/23 16:09:58, jasonwkim wrote:
> On 2011/02/23 15:40:00, robertm wrote:
> > Could you add some info to the description.
> > Maybe indicated that this is not just a cherry
> > pick but that it also contains local mods.
> 
> PTAL. 
> 
> > 
> > 
> > On 2011/02/23 15:28:17, jasonwkim wrote:
> > >
> >
>
http://codereview.chromium.org/6538110/diff/1/llvm-trunk/lib/MC/ELFObjectWrit...
> > > File llvm-trunk/lib/MC/ELFObjectWriter.cpp (right):
> > > 
> > >
> >
>
http://codereview.chromium.org/6538110/diff/1/llvm-trunk/lib/MC/ELFObjectWrit...
> > > llvm-trunk/lib/MC/ELFObjectWriter.cpp:281: // @LOCALMOD-BEGIN
> > > On 2011/02/23 15:08:58, robertm wrote:
> > > > I am confused which way are you cherry picking.
> > > > Why is there a LOCAMOD here
> > > 
> > > Because our code uses EF_NACL_ALIGN_32 which the upstream doesn't know
> about,
> > > thus the @LOCALMOD
> > > 
> > > This code was lifted from line 477 of the PNACL ELFObjectWriter.cpp I am
> also
> > > merely preserving the localmod that was there