projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove SSE1-4 disable when AVX is enabled. While this may be useful for development,
[oota-llvm.git]
/
lib
/
Target
/
X86
/
X86AsmBackend.cpp
diff --git
a/lib/Target/X86/X86AsmBackend.cpp
b/lib/Target/X86/X86AsmBackend.cpp
index ab8f62874527254d65e374f73047c6d13f705744..48467c89e5b9fec71c9568a274087f9e561bf42f 100644
(file)
--- a/
lib/Target/X86/X86AsmBackend.cpp
+++ b/
lib/Target/X86/X86AsmBackend.cpp
@@
-18,23
+18,22
@@
#include "llvm/MC/MCSectionCOFF.h"
#include "llvm/MC/MCSectionELF.h"
#include "llvm/MC/MCSectionMachO.h"
#include "llvm/MC/MCSectionCOFF.h"
#include "llvm/MC/MCSectionELF.h"
#include "llvm/MC/MCSectionMachO.h"
+#include "llvm/Object/MachOFormat.h"
#include "llvm/Support/ELF.h"
#include "llvm/Support/ELF.h"
-#include "llvm/Support/MachO.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetRegistry.h"
#include "llvm/Target/TargetAsmBackend.h"
using namespace llvm;
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetRegistry.h"
#include "llvm/Target/TargetAsmBackend.h"
using namespace llvm;
-
static unsigned getFixupKindLog2Size(unsigned Kind) {
switch (Kind) {
default: assert(0 && "invalid fixup kind!");
static unsigned getFixupKindLog2Size(unsigned Kind) {
switch (Kind) {
default: assert(0 && "invalid fixup kind!");
- case
X86::reloc_pcrel_1byte
:
+ case
FK_PCRel_1
:
case FK_Data_1: return 0;
case FK_Data_1: return 0;
- case
X86::reloc_pcrel_2byte
:
+ case
FK_PCRel_2
:
case FK_Data_2: return 1;
case FK_Data_2: return 1;
- case
X86::reloc_pcrel_4byte
:
+ case
FK_PCRel_4
:
case X86::reloc_riprel_4byte:
case X86::reloc_riprel_4byte_movq_load:
case X86::reloc_signed_4byte:
case X86::reloc_riprel_4byte:
case X86::reloc_riprel_4byte_movq_load:
case X86::reloc_signed_4byte:
@@
-48,7
+47,7
@@
namespace {
class X86AsmBackend : public TargetAsmBackend {
public:
X86AsmBackend(const Target &T)
class X86AsmBackend : public TargetAsmBackend {
public:
X86AsmBackend(const Target &T)
- : TargetAsmBackend(
T
) {}
+ : TargetAsmBackend() {}
void ApplyFixup(const MCFixup &Fixup, MCDataFragment &DF,
uint64_t Value) const {
void ApplyFixup(const MCFixup &Fixup, MCDataFragment &DF,
uint64_t Value) const {
@@
-360,8
+359,9
@@
public:
}
MCObjectWriter *createObjectWriter(raw_ostream &OS) const {
}
MCObjectWriter *createObjectWriter(raw_ostream &OS) const {
- return createMachObjectWriter(OS, /*Is64Bit=*/false, MachO::CPUTypeI386,
- MachO::CPUSubType_I386_ALL,
+ return createMachObjectWriter(OS, /*Is64Bit=*/false,
+ object::mach::CTM_i386,
+ object::mach::CSX86_ALL,
/*IsLittleEndian=*/true);
}
};
/*IsLittleEndian=*/true);
}
};
@@
-378,8
+378,9
@@
public:
}
MCObjectWriter *createObjectWriter(raw_ostream &OS) const {
}
MCObjectWriter *createObjectWriter(raw_ostream &OS) const {
- return createMachObjectWriter(OS, /*Is64Bit=*/true, MachO::CPUTypeX86_64,
- MachO::CPUSubType_I386_ALL,
+ return createMachObjectWriter(OS, /*Is64Bit=*/true,
+ object::mach::CTM_x86_64,
+ object::mach::CSX86_ALL,
/*IsLittleEndian=*/true);
}
/*IsLittleEndian=*/true);
}