[llvm-commits] [llvm] r50649 - in /llvm/trunk/lib/Target/X86: X86Subtarget.cpp X86Subtarget.h X86TargetAsmInfo.cpp

[Dan Gohman]

Author: djg
Date: Mon May  5 11:11:31 2008
New Revision: 50649

URL: http://llvm.org/viewvc/llvm-project?rev=50649&view=rev
Log:
Use a dedicated IsLinux flag instead of an ELFLinux TargetType.

Modified:
    llvm/trunk/lib/Target/X86/X86Subtarget.cpp
    llvm/trunk/lib/Target/X86/X86Subtarget.h
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp

Modified: llvm/trunk/lib/Target/X86/X86Subtarget.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Subtarget.cpp?rev=50649&r1=50648&r2=50649&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86Subtarget.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86Subtarget.cpp Mon May  5 11:11:31 2008
@@ -279,7 +279,9 @@
       else
         DarwinVers = 8;  // Minimum supported darwin is Tiger.
     } else if (TT.find("linux") != std::string::npos) {
-      TargetType = isELFLinux;
+      // Linux doesn't imply ELF, but we don't currently support anything else.
+      TargetType = isELF;
+      IsLinux = true;
     } else if (TT.find("cygwin") != std::string::npos) {
       TargetType = isCygwin;
     } else if (TT.find("mingw") != std::string::npos) {
@@ -306,7 +308,8 @@
     TargetType = isWindows;
 #elif defined(__linux__)
     // Linux doesn't imply ELF, but we don't currently support anything else.
-    TargetType = isELFLinux;
+    TargetType = isELF;
+    IsLinux = true;
 #endif
   }
 

Modified: llvm/trunk/lib/Target/X86/X86Subtarget.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Subtarget.h?rev=50649&r1=50648&r2=50649&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86Subtarget.h (original)
+++ llvm/trunk/lib/Target/X86/X86Subtarget.h Mon May  5 11:11:31 2008
@@ -67,7 +67,10 @@
   
   /// DarwinVers - Nonzero if this is a darwin platform: the numeric
   /// version of the platform, e.g. 8 = 10.4 (Tiger), 9 = 10.5 (Leopard), etc.
-  unsigned char DarwinVers; // Is any darwin-ppc platform.
+  unsigned char DarwinVers; // Is any darwin-x86 platform.
+
+  /// isLinux - true if this is a "linux" platform.
+  bool IsLinux;
 
   /// stackAlignment - The minimum alignment known to hold of the stack frame on
   /// entry to the function and which must be maintained by every function.
@@ -84,7 +87,7 @@
 
 public:
   enum {
-    isELF, isELFLinux, isCygwin, isDarwin, isWindows, isMingw
+    isELF, isCygwin, isDarwin, isWindows, isMingw
   } TargetType;
 
   /// This constructor initializes the data members to match that
@@ -133,10 +136,7 @@
 
   bool isTargetDarwin() const { return TargetType == isDarwin; }
   bool isTargetELF() const {
-    return TargetType == isELF || TargetType == isELFLinux;
-  }
-  bool isTargetLinux() const {
-    return TargetType == isELFLinux;
+    return TargetType == isELF;
   }
   bool isTargetWindows() const { return TargetType == isWindows; }
   bool isTargetMingw() const { return TargetType == isMingw; }
@@ -169,6 +169,9 @@
   /// getDarwinVers - Return the darwin version number, 8 = tiger, 9 = leopard.
   unsigned getDarwinVers() const { return DarwinVers; }
   
+  /// isLinux - Return true if the target is "Linux".
+  bool isLinux() const { return IsLinux; }
+
   /// True if accessing the GV requires an extra load. For Windows, dllimported
   /// symbols are indirect, loading the value at address GV rather then the
   /// value of GV itself. This means that the GlobalAddress must be in the base

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=50649&r1=50648&r2=50649&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Mon May  5 11:11:31 2008
@@ -128,7 +128,6 @@
     break;
 
   case X86Subtarget::isELF:
-  case X86Subtarget::isELFLinux:
     ReadOnlySection = "\t.section\t.rodata";
     FourByteConstantSection = "\t.section\t.rodata.cst4,\"aM\", at progbits,4";
     EightByteConstantSection = "\t.section\t.rodata.cst8,\"aM\", at progbits,8";
@@ -231,7 +230,7 @@
   }
 
   // On Linux we must declare when we can use a non-executable stack.
-  if (Subtarget->isTargetLinux())
+  if (Subtarget->isLinux())
     NonexecutableStackDirective = "\t.section\t.note.GNU-stack,\"\", at progbits";
 
   AssemblerDialect = Subtarget->getAsmFlavor();