diff options
author | Duncan Sands <baldrick@free.fr> | 2008-11-28 09:29:37 +0000 |
---|---|---|
committer | Duncan Sands <baldrick@free.fr> | 2008-11-28 09:29:37 +0000 |
commit | 595a4423dc09a3411335bd559eb959dc3928413d (patch) | |
tree | 843cff78a76bf77069abeb1b25a11f8fbb41b4f0 /llvm/lib/Target/X86/X86Subtarget.h | |
parent | e31a8ebfdcb101be5a48590cda63312d77b5fc45 (diff) | |
download | bcm5719-llvm-595a4423dc09a3411335bd559eb959dc3928413d.tar.gz bcm5719-llvm-595a4423dc09a3411335bd559eb959dc3928413d.zip |
Fix build with gcc-4.4: it doesn't like PICStyle
being both a namespace and a variable name.
llvm-svn: 60208
Diffstat (limited to 'llvm/lib/Target/X86/X86Subtarget.h')
-rw-r--r-- | llvm/lib/Target/X86/X86Subtarget.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/llvm/lib/Target/X86/X86Subtarget.h b/llvm/lib/Target/X86/X86Subtarget.h index b95a2e45e5e..f49008ad69e 100644 --- a/llvm/lib/Target/X86/X86Subtarget.h +++ b/llvm/lib/Target/X86/X86Subtarget.h @@ -23,7 +23,7 @@ class Module; class GlobalValue; class TargetMachine; -namespace PICStyle { +namespace PICStyles { enum Style { Stub, GOT, RIPRel, WinPIC, None }; @@ -51,7 +51,7 @@ protected: /// PICStyle - Which PIC style to use /// - PICStyle::Style PICStyle; + PICStyles::Style PICStyle; /// X86SSELevel - MMX, SSE1, SSE2, SSE3, SSSE3, SSE41, SSE42, or /// none supported. @@ -114,8 +114,8 @@ public: bool is64Bit() const { return Is64Bit; } - PICStyle::Style getPICStyle() const { return PICStyle; } - void setPICStyle(PICStyle::Style Style) { PICStyle = Style; } + PICStyles::Style getPICStyle() const { return PICStyle; } + void setPICStyle(PICStyles::Style Style) { PICStyle = Style; } bool hasMMX() const { return X86SSELevel >= MMX; } bool hasSSE1() const { return X86SSELevel >= SSE1; } @@ -160,11 +160,11 @@ public: return std::string(p); } - bool isPICStyleSet() const { return PICStyle != PICStyle::None; } - bool isPICStyleGOT() const { return PICStyle == PICStyle::GOT; } - bool isPICStyleStub() const { return PICStyle == PICStyle::Stub; } - bool isPICStyleRIPRel() const { return PICStyle == PICStyle::RIPRel; } - bool isPICStyleWinPIC() const { return PICStyle == PICStyle:: WinPIC; } + bool isPICStyleSet() const { return PICStyle != PICStyles::None; } + bool isPICStyleGOT() const { return PICStyle == PICStyles::GOT; } + bool isPICStyleStub() const { return PICStyle == PICStyles::Stub; } + bool isPICStyleRIPRel() const { return PICStyle == PICStyles::RIPRel; } + bool isPICStyleWinPIC() const { return PICStyle == PICStyles:: WinPIC; } /// getDarwinVers - Return the darwin version number, 8 = tiger, 9 = leopard. unsigned getDarwinVers() const { return DarwinVers; } |