Merge upstream r127116

1 files changed, 15 insertions, 2 deletions

diff --git a/include/llvm/Object/ObjectFile.h b/include/llvm/Object/ObjectFile.h
index ca51581..eee9d44 100644
--- a/include/llvm/Object/ObjectFile.h
+++ b/include/llvm/Object/ObjectFile.h
@@ -15,7 +15,8 @@
 #define LLVM_OBJECT_OBJECT_FILE_H
 
 #include "llvm/ADT/StringRef.h"
-#include "llvm/System/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
+#include <cstring>
 
 namespace llvm {
 
@@ -25,7 +26,19 @@ class StringRef;
 namespace object {
 
 class ObjectFile;
-typedef uint64_t DataRefImpl;
+
+union DataRefImpl {
+  struct {
+    uint32_t a, b;
+  } d;
+  intptr_t p;
+};
+
+static bool operator ==(const DataRefImpl &a, const DataRefImpl &b) {
+  // Check bitwise identical. This is the only legal way to compare a union w/o
+  // knowing which member is in use.
+  return std::memcmp(&a, &b, sizeof(DataRefImpl)) == 0;
+}
 
 /// SymbolRef - This is a value type class that represents a single symbol in
 /// the list of symbols in the object file.