<div dir="ltr">Without this, this test does not pass on BE host, right? If so, yes, we should merge this.<div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jul 24, 2017 at 4:18 PM, Tom Stellard <span dir="ltr"><<a href="mailto:tstellar@redhat.com" target="_blank">tstellar@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Is this OK to merge to the 5.0 branch?<br>
<span class="HOEnZb"><font color="#888888"><br>
-Tom<br>
</font></span><div class="HOEnZb"><div class="h5"><br>
On 07/24/2017 07:13 PM, Tom Stellard via llvm-commits wrote:<br>
> Author: tstellar<br>
> Date: Mon Jul 24 16:13:31 2017<br>
> New Revision: 308935<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=308935&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=308935&view=rev</a><br>
> Log:<br>
> Fix ObjCPass on big-endian host<br>
><br>
> Summary:<br>
> This fixes test/mach-o/objc-image-info-<wbr>pass-output.yaml on<br>
> big-endian hosts.<br>
><br>
> Reviewers: lhames, kledzik, ruiu<br>
><br>
> Reviewed By: ruiu<br>
><br>
> Subscribers: llvm-commits<br>
><br>
> Differential Revision: <a href="https://reviews.llvm.org/D35052" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D35052</a><br>
><br>
> Modified:<br>
>     lld/trunk/lib/ReaderWriter/<wbr>MachO/ObjCPass.cpp<br>
><br>
> Modified: lld/trunk/lib/ReaderWriter/<wbr>MachO/ObjCPass.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/ObjCPass.cpp?rev=308935&r1=308934&r2=308935&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/lld/trunk/lib/<wbr>ReaderWriter/MachO/ObjCPass.<wbr>cpp?rev=308935&r1=308934&r2=<wbr>308935&view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- lld/trunk/lib/ReaderWriter/<wbr>MachO/ObjCPass.cpp (original)<br>
> +++ lld/trunk/lib/ReaderWriter/<wbr>MachO/ObjCPass.cpp Mon Jul 24 16:13:31 2017<br>
> @@ -11,6 +11,7 @@<br>
><br>
>  #include "ArchHandler.h"<br>
>  #include "File.h"<br>
> +#include "<wbr>MachONormalizedFileBinaryUtils<wbr>.h"<br>
>  #include "MachOPasses.h"<br>
>  #include "lld/Core/DefinedAtom.h"<br>
>  #include "lld/Core/File.h"<br>
> @@ -29,7 +30,7 @@ namespace mach_o {<br>
>  ///<br>
>  class ObjCImageInfoAtom : public SimpleDefinedAtom {<br>
>  public:<br>
> -  ObjCImageInfoAtom(const File &file,<br>
> +  ObjCImageInfoAtom(const File &file, bool isBig,<br>
>                      MachOLinkingContext::<wbr>ObjCConstraint objCConstraint,<br>
>                      uint32_t swiftVersion)<br>
>        : SimpleDefinedAtom(file) {<br>
> @@ -54,6 +55,8 @@ public:<br>
>      }<br>
><br>
>      Data.info.flags |= (swiftVersion << 8);<br>
> +<br>
> +    normalized::write32(Data.bytes + 4, Data.info.flags, isBig);<br>
>    }<br>
><br>
>    ~ObjCImageInfoAtom() override = default;<br>
> @@ -109,7 +112,8 @@ public:<br>
>  private:<br>
><br>
>    const DefinedAtom* getImageInfo() {<br>
> -    return new (_file.allocator()) ObjCImageInfoAtom(_file,<br>
> +    bool IsBig = MachOLinkingContext::<wbr>isBigEndian(_ctx.arch());<br>
> +    return new (_file.allocator()) ObjCImageInfoAtom(_file, IsBig,<br>
>                                                       _ctx.objcConstraint(),<br>
>                                                       _ctx.swiftVersion());<br>
>    }<br>
><br>
><br>
> ______________________________<wbr>_________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
><br>
<br>
</div></div></blockquote></div><br></div></div>