diff --git a/llvm/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp b/llvm/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp
--- a/llvm/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp
@@ -16,6 +16,14 @@
 using namespace llvm;
 using namespace llvm::orc;
 
+// Writing 64-bit XCOFF isn't supported yet, so we need to disable some tests on
+// AIX till it is.
+#ifdef _AIX
+#define SKIPTEST_IF_UNSUPPORTED() return
+#else
+#define SKIPTEST_IF_UNSUPPORTED()
+#endif
+
 namespace {
 
 class MockObjectLayer {
@@ -109,6 +117,7 @@
 }
 
 TEST(RemoteObjectLayer, AddObject) {
+  SKIPTEST_IF_UNSUPPORTED();
   llvm::orc::rpc::registerStringError<rpc::RawByteChannel>();
   auto TestObject = createTestObject();
   if (!TestObject)
@@ -166,6 +175,7 @@
 }
 
 TEST(RemoteObjectLayer, AddObjectFailure) {
+  SKIPTEST_IF_UNSUPPORTED();
   llvm::orc::rpc::registerStringError<rpc::RawByteChannel>();
   auto TestObject = createTestObject();
   if (!TestObject)
@@ -221,6 +231,7 @@
 
 
 TEST(RemoteObjectLayer, RemoveObject) {
+  SKIPTEST_IF_UNSUPPORTED();
   llvm::orc::rpc::registerStringError<rpc::RawByteChannel>();
   auto TestObject = createTestObject();
   if (!TestObject)
@@ -268,6 +279,7 @@
 }
 
 TEST(RemoteObjectLayer, RemoveObjectFailure) {
+  SKIPTEST_IF_UNSUPPORTED();
   llvm::orc::rpc::registerStringError<rpc::RawByteChannel>();
   auto TestObject = createTestObject();
   if (!TestObject)
@@ -324,6 +336,7 @@
 }
 
 TEST(RemoteObjectLayer, FindSymbol) {
+  SKIPTEST_IF_UNSUPPORTED();
   llvm::orc::rpc::registerStringError<rpc::RawByteChannel>();
   auto TestObject = createTestObject();
   if (!TestObject)
@@ -406,6 +419,7 @@
 }
 
 TEST(RemoteObjectLayer, FindSymbolIn) {
+  SKIPTEST_IF_UNSUPPORTED();
   llvm::orc::rpc::registerStringError<rpc::RawByteChannel>();
   auto TestObject = createTestObject();
   if (!TestObject)
@@ -484,6 +498,7 @@
 }
 
 TEST(RemoteObjectLayer, EmitAndFinalize) {
+  SKIPTEST_IF_UNSUPPORTED();
   llvm::orc::rpc::registerStringError<rpc::RawByteChannel>();
   auto TestObject = createTestObject();
   if (!TestObject)
@@ -532,6 +547,7 @@
 }
 
 TEST(RemoteObjectLayer, EmitAndFinalizeFailure) {
+  SKIPTEST_IF_UNSUPPORTED();
   llvm::orc::rpc::registerStringError<rpc::RawByteChannel>();
   auto TestObject = createTestObject();
   if (!TestObject)