6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-09 11:25:55 +00:00
Code Issues Projects Releases Wiki Activity

move a hack out of the asm-printer specific path to the main target selection path.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75095 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2009-07-09 03:37:30 +00:00
parent 11348ee263
commit b2fc55b721
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/Target/X86/X86TargetMachine.cpp
View File

@@ -156,7 +156,7 @@ X86TargetMachine::X86TargetMachine(const Module &M, const std::string &FS,
if (getCodeModel() == CodeModel::Default) if (getCodeModel() == CodeModel::Default)
setCodeModel(CodeModel::Small); setCodeModel(CodeModel::Small);
// ELF and X86-64 don't have a distinct dynamic-no-PIC model. Dynamic-no-PIC // ELF and X86-64 don't have a distinct DynamicNoPIC model. DynamicNoPIC
// is defined as a model for code which may be used in static or dynamic // is defined as a model for code which may be used in static or dynamic
// executables but not necessarily a shared library. On these systems we just // executables but not necessarily a shared library. On these systems we just
// compile in -static mode. // compile in -static mode.
@@ -164,6 +164,13 @@ X86TargetMachine::X86TargetMachine(const Module &M, const std::string &FS,
!Subtarget.isTargetDarwin()) !Subtarget.isTargetDarwin())
setRelocationModel(Reloc::Static); setRelocationModel(Reloc::Static);
// If we are on Darwin, disallow static relocation model in X86-64 mode, since
// the Mach-O file format doesn't support it.
if (getRelocationModel() == Reloc::Static &&
Subtarget.isTargetDarwin() &&
is64Bit)
setRelocationModel(Reloc::PIC_);
// Determine the PICStyle based on the target selected. // Determine the PICStyle based on the target selected.
if (getRelocationModel() == Reloc::Static) { if (getRelocationModel() == Reloc::Static) {
// Unless we're in PIC or DynamicNoPIC mode, set the PIC style to None. // Unless we're in PIC or DynamicNoPIC mode, set the PIC style to None.
@@ -224,14 +231,6 @@ bool X86TargetMachine::addAssemblyEmitter(PassManagerBase &PM,
CodeGenOpt::Level OptLevel, CodeGenOpt::Level OptLevel,
bool Verbose, bool Verbose,
raw_ostream &Out) { raw_ostream &Out) {
// FIXME: Move this somewhere else!
// On Darwin, override 64-bit static relocation to pic_ since the
// assembler doesn't support it.
if (DefRelocModel == Reloc::Static &&
Subtarget.isTargetDarwin() && Subtarget.is64Bit() &&
getCodeModel() == CodeModel::Small)
setRelocationModel(Reloc::PIC_);
assert(AsmPrinterCtor && "AsmPrinter was not linked in"); assert(AsmPrinterCtor && "AsmPrinter was not linked in");
if (AsmPrinterCtor) if (AsmPrinterCtor)
PM.add(AsmPrinterCtor(Out, *this, Verbose)); PM.add(AsmPrinterCtor(Out, *this, Verbose));
@@ -245,8 +244,10 @@ bool X86TargetMachine::addCodeEmitter(PassManagerBase &PM,
// FIXME: Move this to TargetJITInfo! // FIXME: Move this to TargetJITInfo!
// On Darwin, do not override 64-bit setting made in X86TargetMachine(). // On Darwin, do not override 64-bit setting made in X86TargetMachine().
if (DefRelocModel == Reloc::Default && if (DefRelocModel == Reloc::Default &&
(!Subtarget.isTargetDarwin() || !Subtarget.is64Bit())) (!Subtarget.isTargetDarwin() || !Subtarget.is64Bit())) {
setRelocationModel(Reloc::Static); setRelocationModel(Reloc::Static);
Subtarget.setPICStyle(PICStyles::None);
}
// 64-bit JIT places everything in the same buffer except external functions. // 64-bit JIT places everything in the same buffer except external functions.
// On Darwin, use small code model but hack the call instruction for // On Darwin, use small code model but hack the call instruction for
@@ -275,8 +276,10 @@ bool X86TargetMachine::addCodeEmitter(PassManagerBase &PM,
// FIXME: Move this to TargetJITInfo! // FIXME: Move this to TargetJITInfo!
// On Darwin, do not override 64-bit setting made in X86TargetMachine(). // On Darwin, do not override 64-bit setting made in X86TargetMachine().
if (DefRelocModel == Reloc::Default && if (DefRelocModel == Reloc::Default &&
(!Subtarget.isTargetDarwin() || !Subtarget.is64Bit())) (!Subtarget.isTargetDarwin() || !Subtarget.is64Bit())) {
setRelocationModel(Reloc::Static); setRelocationModel(Reloc::Static);
Subtarget.setPICStyle(PICStyles::None);
}
// 64-bit JIT places everything in the same buffer except external functions. // 64-bit JIT places everything in the same buffer except external functions.
// On Darwin, use small code model but hack the call instruction for // On Darwin, use small code model but hack the call instruction for
@@ -305,8 +308,10 @@ bool X86TargetMachine::addCodeEmitter(PassManagerBase &PM,
// FIXME: Move this to TargetJITInfo! // FIXME: Move this to TargetJITInfo!
// On Darwin, do not override 64-bit setting made in X86TargetMachine(). // On Darwin, do not override 64-bit setting made in X86TargetMachine().
if (DefRelocModel == Reloc::Default && if (DefRelocModel == Reloc::Default &&
(!Subtarget.isTargetDarwin() || !Subtarget.is64Bit())) (!Subtarget.isTargetDarwin() || !Subtarget.is64Bit())) {
setRelocationModel(Reloc::Static); setRelocationModel(Reloc::Static);
Subtarget.setPICStyle(PICStyles::None);
}
// 64-bit JIT places everything in the same buffer except external functions. // 64-bit JIT places everything in the same buffer except external functions.
// On Darwin, use small code model but hack the call instruction for // On Darwin, use small code model but hack the call instruction for