Use a dedicated IsLinux flag instead of an ELFLinux TargetType.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@50649 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman 2008-05-05 16:11:31 +00:00
parent a779a9899a
commit 600bf16cf7
3 changed files with 15 additions and 10 deletions

View File

@ -279,7 +279,9 @@ X86Subtarget::X86Subtarget(const Module &M, const std::string &FS, bool is64Bit)
else else
DarwinVers = 8; // Minimum supported darwin is Tiger. DarwinVers = 8; // Minimum supported darwin is Tiger.
} else if (TT.find("linux") != std::string::npos) { } 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) { } else if (TT.find("cygwin") != std::string::npos) {
TargetType = isCygwin; TargetType = isCygwin;
} else if (TT.find("mingw") != std::string::npos) { } else if (TT.find("mingw") != std::string::npos) {
@ -306,7 +308,8 @@ X86Subtarget::X86Subtarget(const Module &M, const std::string &FS, bool is64Bit)
TargetType = isWindows; TargetType = isWindows;
#elif defined(__linux__) #elif defined(__linux__)
// Linux doesn't imply ELF, but we don't currently support anything else. // Linux doesn't imply ELF, but we don't currently support anything else.
TargetType = isELFLinux; TargetType = isELF;
IsLinux = true;
#endif #endif
} }

View File

@ -67,7 +67,10 @@ protected:
/// DarwinVers - Nonzero if this is a darwin platform: the numeric /// 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. /// 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 /// stackAlignment - The minimum alignment known to hold of the stack frame on
/// entry to the function and which must be maintained by every function. /// entry to the function and which must be maintained by every function.
@ -84,7 +87,7 @@ private:
public: public:
enum { enum {
isELF, isELFLinux, isCygwin, isDarwin, isWindows, isMingw isELF, isCygwin, isDarwin, isWindows, isMingw
} TargetType; } TargetType;
/// This constructor initializes the data members to match that /// This constructor initializes the data members to match that
@ -133,10 +136,7 @@ public:
bool isTargetDarwin() const { return TargetType == isDarwin; } bool isTargetDarwin() const { return TargetType == isDarwin; }
bool isTargetELF() const { bool isTargetELF() const {
return TargetType == isELF || TargetType == isELFLinux; return TargetType == isELF;
}
bool isTargetLinux() const {
return TargetType == isELFLinux;
} }
bool isTargetWindows() const { return TargetType == isWindows; } bool isTargetWindows() const { return TargetType == isWindows; }
bool isTargetMingw() const { return TargetType == isMingw; } bool isTargetMingw() const { return TargetType == isMingw; }
@ -169,6 +169,9 @@ public:
/// getDarwinVers - Return the darwin version number, 8 = tiger, 9 = leopard. /// getDarwinVers - Return the darwin version number, 8 = tiger, 9 = leopard.
unsigned getDarwinVers() const { return DarwinVers; } 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 /// True if accessing the GV requires an extra load. For Windows, dllimported
/// symbols are indirect, loading the value at address GV rather then the /// 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 /// value of GV itself. This means that the GlobalAddress must be in the base

View File

@ -128,7 +128,6 @@ X86TargetAsmInfo::X86TargetAsmInfo(const X86TargetMachine &TM) {
break; break;
case X86Subtarget::isELF: case X86Subtarget::isELF:
case X86Subtarget::isELFLinux:
ReadOnlySection = "\t.section\t.rodata"; ReadOnlySection = "\t.section\t.rodata";
FourByteConstantSection = "\t.section\t.rodata.cst4,\"aM\",@progbits,4"; FourByteConstantSection = "\t.section\t.rodata.cst4,\"aM\",@progbits,4";
EightByteConstantSection = "\t.section\t.rodata.cst8,\"aM\",@progbits,8"; EightByteConstantSection = "\t.section\t.rodata.cst8,\"aM\",@progbits,8";
@ -231,7 +230,7 @@ X86TargetAsmInfo::X86TargetAsmInfo(const X86TargetMachine &TM) {
} }
// On Linux we must declare when we can use a non-executable stack. // 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,\"\",@progbits"; NonexecutableStackDirective = "\t.section\t.note.GNU-stack,\"\",@progbits";
AssemblerDialect = Subtarget->getAsmFlavor(); AssemblerDialect = Subtarget->getAsmFlavor();