[llvm-branch-commits] [cfe-branch] r214257 - Merging r214208:

[Bob Wilson]

Author: bwilson
Date: Tue Jul 29 18:48:32 2014
New Revision: 214257

URL: http://llvm.org/viewvc/llvm-project?rev=214257&view=rev
Log:
Merging r214208:

Modified:
    cfe/branches/release_35/   (props changed)
    cfe/branches/release_35/include/clang/Driver/ToolChain.h
    cfe/branches/release_35/lib/Driver/ToolChains.h
    cfe/branches/release_35/test/Driver/linker-opts.c

Propchange: cfe/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 29 18:48:32 2014
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:213741
+/cfe/trunk:213741,214208
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_35/include/clang/Driver/ToolChain.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_35/include/clang/Driver/ToolChain.h?rev=214257&r1=214256&r2=214257&view=diff
==============================================================================
--- cfe/branches/release_35/include/clang/Driver/ToolChain.h (original)
+++ cfe/branches/release_35/include/clang/Driver/ToolChain.h Tue Jul 29 18:48:32 2014
@@ -116,9 +116,6 @@ public:
   StringRef getPlatform() const { return Triple.getVendorName(); }
   StringRef getOS() const { return Triple.getOSName(); }
 
-  /// \brief Returns true if the toolchain is targeting a non-native architecture.
-  bool isCrossCompiling() const;
-
   /// \brief Provide the default architecture name (as expected by -arch) for
   /// this toolchain. Note t
   std::string getDefaultUniversalArchName() const;
@@ -171,6 +168,10 @@ public:
 
   // Platform defaults information
 
+  /// \brief Returns true if the toolchain is targeting a non-native
+  /// architecture.
+  virtual bool isCrossCompiling() const;
+
   /// HasNativeLTOLinker - Check whether the linker and related tools have
   /// native LLVM support.
   virtual bool HasNativeLLVMSupport() const;

Modified: cfe/branches/release_35/lib/Driver/ToolChains.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_35/lib/Driver/ToolChains.h?rev=214257&r1=214256&r2=214257&view=diff
==============================================================================
--- cfe/branches/release_35/lib/Driver/ToolChains.h (original)
+++ cfe/branches/release_35/lib/Driver/ToolChains.h Tue Jul 29 18:48:32 2014
@@ -427,6 +427,11 @@ public:
   /// @name ToolChain Implementation
   /// {
 
+  // Darwin tools support multiple architecture (e.g., i386 and x86_64) and
+  // most development is done against SDKs, so compiling for a different
+  // architecture should not get any special treatment.
+  bool isCrossCompiling() const override { return false; }
+
   llvm::opt::DerivedArgList *
   TranslateArgs(const llvm::opt::DerivedArgList &Args,
                 const char *BoundArch) const override;

Modified: cfe/branches/release_35/test/Driver/linker-opts.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_35/test/Driver/linker-opts.c?rev=214257&r1=214256&r2=214257&view=diff
==============================================================================
--- cfe/branches/release_35/test/Driver/linker-opts.c (original)
+++ cfe/branches/release_35/test/Driver/linker-opts.c Tue Jul 29 18:48:32 2014
@@ -5,3 +5,7 @@
 // XFAIL: win32
 // REQUIRES: clang-driver
 // REQUIRES: native
+
+// Make sure that LIBRARY_PATH works for both i386 and x86_64 on Darwin.
+// RUN: env LIBRARY_PATH=%T/test1 %clang -target x86_64-apple-darwin %s -### 2>&1 | FileCheck %s
+// RUN: env LIBRARY_PATH=%T/test1 %clang -target i386-apple-darwin  %s -### 2>&1 | FileCheck %s