[lld] r308935 - Fix ObjCPass on big-endian host

[Rui Ueyama via llvm-commits]

Filed as https://bugs.llvm.org/show_bug.cgi?id=33918. I'll merge this into
5.0.

On Mon, Jul 24, 2017 at 4:23 PM, Tom Stellard <tstellar at redhat.com> wrote:

> On 07/24/2017 07:20 PM, Rui Ueyama wrote:
> > Without this, this test does not pass on BE host, right? If so, yes, we
> should merge this.
> >
>
> Correct, the test will fail on BE without this patch.
>
> -Tom
>
> > On Mon, Jul 24, 2017 at 4:18 PM, Tom Stellard <tstellar at redhat.com
> <mailto:tstellar at redhat.com>> wrote:
> >
> >     Is this OK to merge to the 5.0 branch?
> >
> >     -Tom
> >
> >     On 07/24/2017 07:13 PM, Tom Stellard via llvm-commits wrote:
> >     > Author: tstellar
> >     > Date: Mon Jul 24 16:13:31 2017
> >     > New Revision: 308935
> >     >
> >     > URL: http://llvm.org/viewvc/llvm-project?rev=308935&view=rev <
> http://llvm.org/viewvc/llvm-project?rev=308935&view=rev>
> >     > Log:
> >     > Fix ObjCPass on big-endian host
> >     >
> >     > Summary:
> >     > This fixes test/mach-o/objc-image-info-pass-output.yaml on
> >     > big-endian hosts.
> >     >
> >     > Reviewers: lhames, kledzik, ruiu
> >     >
> >     > Reviewed By: ruiu
> >     >
> >     > Subscribers: llvm-commits
> >     >
> >     > Differential Revision: https://reviews.llvm.org/D35052 <
> https://reviews.llvm.org/D35052>
> >     >
> >     > Modified:
> >     >     lld/trunk/lib/ReaderWriter/MachO/ObjCPass.cpp
> >     >
> >     > Modified: lld/trunk/lib/ReaderWriter/MachO/ObjCPass.cpp
> >     > URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/
> ReaderWriter/MachO/ObjCPass.cpp?rev=308935&r1=308934&r2=308935&view=diff <
> http://llvm.org/viewvc/llvm-project/lld/trunk/lib/
> ReaderWriter/MachO/ObjCPass.cpp?rev=308935&r1=308934&r2=308935&view=diff>
> >     > ============================================================
> ==================
> >     > --- lld/trunk/lib/ReaderWriter/MachO/ObjCPass.cpp (original)
> >     > +++ lld/trunk/lib/ReaderWriter/MachO/ObjCPass.cpp Mon Jul 24
> 16:13:31 2017
> >     > @@ -11,6 +11,7 @@
> >     >
> >     >  #include "ArchHandler.h"
> >     >  #include "File.h"
> >     > +#include "MachONormalizedFileBinaryUtils.h"
> >     >  #include "MachOPasses.h"
> >     >  #include "lld/Core/DefinedAtom.h"
> >     >  #include "lld/Core/File.h"
> >     > @@ -29,7 +30,7 @@ namespace mach_o {
> >     >  ///
> >     >  class ObjCImageInfoAtom : public SimpleDefinedAtom {
> >     >  public:
> >     > -  ObjCImageInfoAtom(const File &file,
> >     > +  ObjCImageInfoAtom(const File &file, bool isBig,
> >     >                      MachOLinkingContext::ObjCConstraint
> objCConstraint,
> >     >                      uint32_t swiftVersion)
> >     >        : SimpleDefinedAtom(file) {
> >     > @@ -54,6 +55,8 @@ public:
> >     >      }
> >     >
> >     >      Data.info.flags |= (swiftVersion << 8);
> >     > +
> >     > +    normalized::write32(Data.bytes + 4, Data.info.flags, isBig);
> >     >    }
> >     >
> >     >    ~ObjCImageInfoAtom() override = default;
> >     > @@ -109,7 +112,8 @@ public:
> >     >  private:
> >     >
> >     >    const DefinedAtom* getImageInfo() {
> >     > -    return new (_file.allocator()) ObjCImageInfoAtom(_file,
> >     > +    bool IsBig = MachOLinkingContext::isBigEndian(_ctx.arch());
> >     > +    return new (_file.allocator()) ObjCImageInfoAtom(_file, IsBig,
> >     >
>  _ctx.objcConstraint(),
> >     >
>  _ctx.swiftVersion());
> >     >    }
> >     >
> >     >
> >     > _______________________________________________
> >     > llvm-commits mailing list
> >     > llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>
> >     > http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits <
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits>
> >     >
> >
> >
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170724/1245cc00/attachment.html>