From f32c1f0b36e3f0c943b54083b1ab08e0580ff3ae Mon Sep 17 00:00:00 2001
From: David Grove <groved@us.ibm.com>
Date: Tue, 5 Jul 2016 14:05:40 -0400
Subject: [PATCH] [Importer] define SWIFT_SDK_OVERLAY_DISPATCH_EPOCH on
 non-Darwin platforms

The importer also processes libdispatch headers on non-Darwin platforms;
define SWIFT_SDK_OVERLAY_DISPATCH_EPOCH on them as well.
---
 lib/ClangImporter/ClangImporter.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/ClangImporter/ClangImporter.cpp b/lib/ClangImporter/ClangImporter.cpp
index 9785783ee7c82..bfffda8a660a6 100644
--- a/lib/ClangImporter/ClangImporter.cpp
+++ b/lib/ClangImporter/ClangImporter.cpp
@@ -390,6 +390,11 @@ getNormalInvocationArguments(std::vector<std::string> &invocationArgStrs,
       //
       // Just use the most feature-rich C language mode.
       "-x", "c", "-std=gnu11",
+
+      // Define macros that Swift bridging headers use.
+
+      // Request new APIs from libdispatch.
+      "-DSWIFT_SDK_OVERLAY_DISPATCH_EPOCH=2",
     });
 
     // The module map used for Glibc depends on the target we're compiling for,