Revert r83443.

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

diff --git a/lib/Driver/HostInfo.cpp b/lib/Driver/HostInfo.cpp
index 22fe11d661a27e1ec0fe9ec31483d7b370499724..08c4ef490017c3ecfb37873070b6ac9f6e3dfe37 100644 (file)
--- a/lib/Driver/HostInfo.cpp
+++ b/lib/Driver/HostInfo.cpp
@@ -42,7 +42,7 @@ class DarwinHostInfo : public HostInfo {
   unsigned DarwinVersion[3];
 
   /// GCC version to use on this host.
-  unsigned GCCVersion[4];
+  unsigned GCCVersion[3];
 
   /// Cache of tool chains we have created.
   mutable llvm::DenseMap<unsigned, ToolChain*> ToolChains;
@@ -84,12 +84,6 @@ DarwinHostInfo::DarwinHostInfo(const Driver &D, const llvm::Triple& Triple)
   GCCVersion[0] = 4;
   GCCVersion[1] = 2;
   GCCVersion[2] = 1;
-  // And we need to select the OS gcc was configured for, darwin10
-#ifdef OS_MAJOR
-  GCCVersion[3] = OS_MAJOR;
-#else
-  GCCVersion[3] = 10;
-#endif
 }
 
 DarwinHostInfo::~DarwinHostInfo() {

diff --git a/lib/Driver/Makefile b/lib/Driver/Makefile
index ef7bc60aeb09941d948423a5cf1cbd8e941655aa..6a31e5fb886fea45a5b8bacec7d54be96fd897d4 100644 (file)
--- a/lib/Driver/Makefile
+++ b/lib/Driver/Makefile
@@ -11,10 +11,10 @@ LEVEL = ../../../..
 LIBRARYNAME := clangDriver
 BUILD_ARCHIVE = 1
 CXXFLAGS = -fno-rtti
-OS_MAJOR := -DOS_MAJOR=$(shell uname -r | sed 's/\..*//')
+
 # Don't install Clang libraries
 NO_INSTALL = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include $(OS_MAJOR)
+CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 443ce80ae8f5f5666e851769b6dc77a8ea102a87..a5a48adcf0285b41d342543cf023b4ba8c3209f3 100644 (file)
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -46,18 +46,17 @@ Darwin::Darwin(const HostInfo &Host, const llvm::Triple& Triple,
 
 DarwinGCC::DarwinGCC(const HostInfo &Host, const llvm::Triple& Triple,
                      const unsigned (&DarwinVersion)[3],
-                     const unsigned (&_GCCVersion)[4], bool IsIPhoneOS)
+                     const unsigned (&_GCCVersion)[3], bool IsIPhoneOS)
   : Darwin(Host, Triple, DarwinVersion, IsIPhoneOS)
 {
   GCCVersion[0] = _GCCVersion[0];
   GCCVersion[1] = _GCCVersion[1];
   GCCVersion[2] = _GCCVersion[2];
-  GCCVersion[3] = _GCCVersion[3];
 
   // Set up the tool chain paths to match gcc.
 
   ToolChainDir = "i686-apple-darwin";
-  ToolChainDir += llvm::utostr(GCCVersion[3]);
+  ToolChainDir += llvm::utostr(DarwinVersion[0]);
   ToolChainDir += "/";
   ToolChainDir += llvm::utostr(GCCVersion[0]);
   ToolChainDir += '.';

diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
index 5934be47881ede4538fadf1db9e44289fd78d050..6088d9617cf0453fb89fa08a4383e7f2527f4a7b 100644 (file)
--- a/lib/Driver/ToolChains.h
+++ b/lib/Driver/ToolChains.h
@@ -165,14 +165,14 @@ public:
 /// DarwinGCC - The Darwin toolchain used by GCC.
 class VISIBILITY_HIDDEN DarwinGCC : public Darwin {
   /// GCC version to use.
-  unsigned GCCVersion[4];
+  unsigned GCCVersion[3];
 
   /// The directory suffix for this tool chain.
   std::string ToolChainDir;
 
 public:
   DarwinGCC(const HostInfo &Host, const llvm::Triple& Triple,
-            const unsigned (&DarwinVersion)[3], const unsigned (&GCCVersion)[4],
+            const unsigned (&DarwinVersion)[3], const unsigned (&GCCVersion)[3],
             bool IsIPhoneOS);
 
   /// @name Darwin ToolChain Implementation