[PATCH] D35052: Fix ObjCPass on big-endian host

Tom Stellard via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Mon Jul 24 16:15:53 PDT 2017


This revision was automatically updated to reflect the committed changes.
Closed by commit rL308935: Fix ObjCPass on big-endian host (authored by tstellar).

Changed prior to commit:
  https://reviews.llvm.org/D35052?vs=105413&id=107989#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D35052

Files:
  lld/trunk/lib/ReaderWriter/MachO/ObjCPass.cpp


Index: lld/trunk/lib/ReaderWriter/MachO/ObjCPass.cpp
===================================================================
--- lld/trunk/lib/ReaderWriter/MachO/ObjCPass.cpp
+++ lld/trunk/lib/ReaderWriter/MachO/ObjCPass.cpp
@@ -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 @@
 ///
 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 @@
     }
 
     Data.info.flags |= (swiftVersion << 8);
+
+    normalized::write32(Data.bytes + 4, Data.info.flags, isBig);
   }
 
   ~ObjCImageInfoAtom() override = default;
@@ -109,7 +112,8 @@
 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());
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D35052.107989.patch
Type: text/x-patch
Size: 1362 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170724/0c431367/attachment.bin>


More information about the llvm-commits mailing list