[llvm-branch-commits] [cfe-branch] r83450 - in /cfe/branches/Apple/Dib/lib/Driver: HostInfo.cpp Makefile ToolChains.cpp ToolChains.h

[Ted Kremenek]

Author: kremenek
Date: Tue Oct  6 22:19:16 2009
New Revision: 83450

URL: http://llvm.org/viewvc/llvm-project?rev=83450&view=rev
Log:
Revert r83444.

Modified:
    cfe/branches/Apple/Dib/lib/Driver/HostInfo.cpp
    cfe/branches/Apple/Dib/lib/Driver/Makefile
    cfe/branches/Apple/Dib/lib/Driver/ToolChains.cpp
    cfe/branches/Apple/Dib/lib/Driver/ToolChains.h

Modified: cfe/branches/Apple/Dib/lib/Driver/HostInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Driver/HostInfo.cpp?rev=83450&r1=83449&r2=83450&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/Driver/HostInfo.cpp (original)
+++ cfe/branches/Apple/Dib/lib/Driver/HostInfo.cpp Tue Oct  6 22:19:16 2009
@@ -45,7 +45,7 @@
   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::StringMap<ToolChain *> ToolChains;
@@ -94,12 +94,6 @@
   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() {

Modified: cfe/branches/Apple/Dib/lib/Driver/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Driver/Makefile?rev=83450&r1=83449&r2=83450&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/Driver/Makefile (original)
+++ cfe/branches/Apple/Dib/lib/Driver/Makefile Tue Oct  6 22:19:16 2009
@@ -11,14 +11,13 @@
 LIBRARYNAME := clangDriver
 BUILD_ARCHIVE = 1
 CXXFLAGS = -fno-rtti
-OS_MAJOR := -DOS_MAJOR=$(shell uname -r | sed 's/\..*//')
+
 
 include $(LEVEL)/Makefile.common
 
 SVN_REVISION := $(shell cd $(PROJ_SRC_DIR)/../.. && svnversion)
 
 CPP.Defines += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include \
-	 $(OS_MAJOR) \
          -DSVN_REVISION='"$(SVN_REVISION)"'
 
 $(ObjDir)/.ver-svn .ver:

Modified: cfe/branches/Apple/Dib/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Driver/ToolChains.cpp?rev=83450&r1=83449&r2=83450&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/Driver/ToolChains.cpp (original)
+++ cfe/branches/Apple/Dib/lib/Driver/ToolChains.cpp Tue Oct  6 22:19:16 2009
@@ -30,7 +30,7 @@
 Darwin_X86::Darwin_X86(const HostInfo &Host, const char *Arch, 
                        const char *Platform, const char *OS, 
                        const unsigned (&_DarwinVersion)[3],
-                       const unsigned (&_GCCVersion)[4])
+                       const unsigned (&_GCCVersion)[3])
   : ToolChain(Host, Arch, Platform, OS) {
   DarwinVersion[0] = _DarwinVersion[0];
   DarwinVersion[1] = _DarwinVersion[1];
@@ -38,13 +38,12 @@
   GCCVersion[0] = _GCCVersion[0];
   GCCVersion[1] = _GCCVersion[1];
   GCCVersion[2] = _GCCVersion[2];
-  GCCVersion[3] = _GCCVersion[3];
 
   llvm::raw_string_ostream(MacosxVersionMin)
     << "10." << DarwinVersion[0] - 4 << '.' << DarwinVersion[1];
 
   ToolChainDir = "i686-apple-darwin";
-  ToolChainDir += llvm::utostr(GCCVersion[3]);
+  ToolChainDir += llvm::utostr(DarwinVersion[0]);
   ToolChainDir += "/";
   ToolChainDir += llvm::utostr(GCCVersion[0]);
   ToolChainDir += '.';

Modified: cfe/branches/Apple/Dib/lib/Driver/ToolChains.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Driver/ToolChains.h?rev=83450&r1=83449&r2=83450&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/Driver/ToolChains.h (original)
+++ cfe/branches/Apple/Dib/lib/Driver/ToolChains.h Tue Oct  6 22:19:16 2009
@@ -52,7 +52,7 @@
   unsigned DarwinVersion[3];
 
   /// GCC version to use.
-  unsigned GCCVersion[4];
+  unsigned GCCVersion[3];
 
   /// The directory suffix for this tool chain.
   std::string ToolChainDir;
@@ -66,7 +66,7 @@
 public:
   Darwin_X86(const HostInfo &Host, const char *Arch, const char *Platform, 
              const char *OS, const unsigned (&DarwinVersion)[3],
-             const unsigned (&GCCVersion)[4]);
+             const unsigned (&GCCVersion)[3]);
   ~Darwin_X86();
 
   void getDarwinVersion(unsigned (&Res)[3]) const {