---

yaml
---
r: 347636
b: refs/heads/master
c: 76e02b6
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9da051c4e62281ac88aea15297eb5ba71a5cf793
+refs/heads/master: 76e02b6b4413b47c3c60ec035727b5d50bc97651
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/SwiftRemoteMirror/SwiftRemoteMirror.h

@@ -37,7 +37,7 @@
 extern "C" {
 #endif
 
-SWIFT_REMOTE_MIRROR_LINKAGE
+SWIFT_REMOTE_MIRROR_LINKAGE __attribute__((__weak_import__))
 extern unsigned long long swift_reflection_classIsSwiftMask;
 
 /// Get the metadata version supported by the Remote Mirror library.

trunk/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp

@@ -14,7 +14,7 @@
 
 #define SWIFT_CLASS_IS_SWIFT_MASK swift_reflection_classIsSwiftMask
 extern "C" {
-SWIFT_REMOTE_MIRROR_LINKAGE
+SWIFT_REMOTE_MIRROR_LINKAGE __attribute__((__weak_import__))
 unsigned long long swift_reflection_classIsSwiftMask = 2;
 }
 

trunk/stdlib/tools/swift-reflection-test/swift-reflection-test.c

@@ -576,7 +576,10 @@ int main(int argc, char *argv[]) {
 
   const char *BinaryFilename = argv[1];
 
-  swift_reflection_classIsSwiftMask = computeClassIsSwiftMask();
+  // swift_reflection_classIsSwiftMask is weak linked so we can work
+  // with older Remote Mirror dylibs.
+  if (&swift_reflection_classIsSwiftMask != NULL)
+    swift_reflection_classIsSwiftMask = computeClassIsSwiftMask();
 
   uint16_t Version = swift_reflection_getSupportedMetadataVersion();
   printf("Metadata version: %u\n", Version);

trunk/utils/remote-run

@@ -94,17 +94,19 @@ class CommandRunner(object):
             sys.exit(sftp_proc.returncode)
 
 class RemoteCommandRunner(CommandRunner):
-    def __init__(self, host, identity_path, ssh_options):
+    def __init__(self, host, identity_path, ssh_options, config_file):
         if ':' in host:
             (self.remote_host, self.port) = host.rsplit(':', 1)
         else:
             self.remote_host = host
             self.port = None
         self.identity_path = identity_path
         self.ssh_options = ssh_options
+        self.config_file = config_file
 
     def common_options(self, port_flag):
         port_option = [port_flag, self.port] if self.port else []
+        config_option = ['-F', self.config_file] if self.config_file else []
         identity_option = (
             ['-i', self.identity_path] if self.identity_path else [])
         # Interleave '-o' with each custom option.
@@ -113,7 +115,7 @@ class RemoteCommandRunner(CommandRunner):
         # https://spapas.github.io/2016/04/27/python-nested-list-comprehensions/
         extra_options = [arg for option in self.ssh_options
                              for arg in ["-o", option]]
-        return port_option + identity_option + extra_options
+        return port_option + identity_option + config_option + extra_options
 
     def remote_invocation(self, command):
         return (['/usr/bin/ssh', '-n'] +
@@ -172,6 +174,8 @@ def main():
 
     parser.add_argument('-i', '--identity', dest='identity', metavar='FILE',
                         help='an SSH identity file (private key) to use')
+    parser.add_argument('-F', '--config-file', dest='config_file', metavar='FILE',
+                        help='an SSH configuration file')
     parser.add_argument('-o', '--ssh-option', action='append', default=[],
                         dest='ssh_options', metavar='OPTION',
                         help='extra SSH config options (man ssh_config)')
@@ -192,7 +196,10 @@ def main():
         args.command.insert(0, args.host)
         del args.host
     else:
-        runner = RemoteCommandRunner(args.host, args.identity, args.ssh_options)
+        runner = RemoteCommandRunner(args.host,
+                                     args.identity,
+                                     args.ssh_options,
+                                     args.config_file)
     runner.dry_run = args.dry_run
     runner.verbose = args.verbose or args.dry_run