[llvm] r359010 - [dsymutil] Put Swift interface files into a per-arch subdirectory.

[Adrian Prantl via llvm-commits]

Author: adrian
Date: Tue Apr 23 09:42:35 2019
New Revision: 359010

URL: http://llvm.org/viewvc/llvm-project?rev=359010&view=rev
Log:
[dsymutil] Put Swift interface files into a per-arch subdirectory.

This was meant to be part of the original commit r358921, but somehow
got lost.

<rdar://problem/49751748>

Modified:
    llvm/trunk/test/tools/dsymutil/X86/swift-interface.test
    llvm/trunk/tools/dsymutil/DwarfLinker.cpp

Modified: llvm/trunk/test/tools/dsymutil/X86/swift-interface.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/swift-interface.test?rev=359010&r1=359009&r2=359010&view=diff
==============================================================================
--- llvm/trunk/test/tools/dsymutil/X86/swift-interface.test (original)
+++ llvm/trunk/test/tools/dsymutil/X86/swift-interface.test Tue Apr 23 09:42:35 2019
@@ -8,7 +8,7 @@
 # RUN: echo "// module Foo" >%t.dir/Foo/x86_64.swiftinterface
 # RUN: dsymutil -oso-prepend-path %t.dir -y %s \
 # RUN:    -o %t.dir/swift-interface.dSYM
-# RUN: cat %t.dir/swift-interface.dSYM/Contents/Resources/Swift/Foo.swiftinterface \
+# RUN: cat %t.dir/swift-interface.dSYM/Contents/Resources/Swift/x86_64/Foo.swiftinterface \
 # RUN:   | FileCheck %s --check-prefix=INTERFACE
 
 # WARNINGS: cannot copy parseable Swift interface

Modified: llvm/trunk/tools/dsymutil/DwarfLinker.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/DwarfLinker.cpp?rev=359010&r1=359009&r2=359010&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/DwarfLinker.cpp (original)
+++ llvm/trunk/tools/dsymutil/DwarfLinker.cpp Tue Apr 23 09:42:35 2019
@@ -2497,7 +2497,7 @@ static Error copySwiftInterfaces(
   std::error_code EC;
   SmallString<128> InputPath;
   SmallString<128> Path;
-  sys::path::append(Path, *Options.ResourceDir, "Swift");
+  sys::path::append(Path, *Options.ResourceDir, "Swift", Architecture);
   if ((EC = sys::fs::create_directories(Path.str(), true,
                                         sys::fs::perms::all_all)))
     return make_error<StringError>(