Removed redundant global.params.cpu field.

Now that we have global.params.targetTriple, the information
is only duplicated.
This commit is contained in:
David Nadlinger
2013-02-07 15:12:52 +01:00
parent bee0b9eba1
commit 5f3ba41574
13 changed files with 55 additions and 57 deletions

View File

@@ -147,17 +147,6 @@ typedef ArrayBase<struct Identifier> Identifiers;
typedef ArrayBase<char> Strings;
#if IN_LLVM
enum ARCH
{
ARCHinvalid = llvm::Triple::UnknownArch,
ARCHx86 = llvm::Triple::x86,
ARCHx86_64 = llvm::Triple::x86_64,
ARCHppc = llvm::Triple::ppc,
ARCHppc_64 = llvm::Triple::ppc64,
ARCHarm = llvm::Triple::arm,
ARCHthumb = llvm::Triple::thumb,
};
enum OUTPUTFLAG
{
OUTPUTFLAGno,
@@ -200,7 +189,6 @@ struct Param
char optimize; // run optimizer
#endif
char map; // generate linker .map file
ARCH cpu; // target CPU
bool is64bit; // generate 64 bit code
#if IN_LLVM
OS os;

View File

@@ -2923,8 +2923,11 @@ unsigned TypeBasic::alignsize()
#if IN_LLVM
unsigned TypeBasic::alignment()
{
if (global.params.cpu == ARCHx86_64 && (ty == Tfloat80 || ty == Timaginary80))
if (global.params.targetTriple.getArch() == llvm::Triple::x86_64 &&
(ty == Tfloat80 || ty == Timaginary80))
{
return 16;
}
return Type::alignment();
}
#endif