[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>

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@359010 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/tools/dsymutil/X86/swift-interface.test b/test/tools/dsymutil/X86/swift-interface.test
index 4bfd2b89e7cd7e4bfedbfae862331cbe60a99e66..696441fdc0aca5a29ee9c487696d8cbeb88f5bf1 100644 (file)
--- a/test/tools/dsymutil/X86/swift-interface.test
+++ b/test/tools/dsymutil/X86/swift-interface.test
@@ -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

diff --git a/tools/dsymutil/DwarfLinker.cpp b/tools/dsymutil/DwarfLinker.cpp
index e97d5026174c5f2ff600677c5919329db19c591d..c8e70eeb7cce39f7255df53e94a5261d48ba4226 100644 (file)
--- a/tools/dsymutil/DwarfLinker.cpp
+++ b/tools/dsymutil/DwarfLinker.cpp
@@ -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>(