Darwin ABI issues: weak, linkonce, etc. dynamic-no-pic support is complete.
Also fixed a function stub bug. Added weak and linkonce support for
x86 Linux.
llvm-svn: 26038
diff --git a/llvm/lib/Target/X86/X86AsmPrinter.cpp b/llvm/lib/Target/X86/X86AsmPrinter.cpp
index 1e42664..dd19d9f 100644
--- a/llvm/lib/Target/X86/X86AsmPrinter.cpp
+++ b/llvm/lib/Target/X86/X86AsmPrinter.cpp
@@ -80,113 +80,93 @@
const TargetData &TD = TM.getTargetData();
// Print out module-level global variables here.
- for (Module::const_global_iterator I = M.global_begin(),
- E = M.global_end(); I != E; ++I) {
+ for (Module::const_global_iterator I = M.global_begin(), E = M.global_end();
+ I != E; ++I) {
if (!I->hasInitializer()) continue; // External global require no code
// Check to see if this is a special global used by LLVM, if so, emit it.
if (I->hasAppendingLinkage() && EmitSpecialLLVMGlobal(I))
continue;
- O << "\n\n";
std::string name = Mang->getValueName(I);
Constant *C = I->getInitializer();
unsigned Size = TD.getTypeSize(C->getType());
unsigned Align = getPreferredAlignmentLog(I);
- switch (I->getLinkage()) {
- default: assert(0 && "Unknown linkage type!");
- case GlobalValue::LinkOnceLinkage:
- case GlobalValue::WeakLinkage: // FIXME: Verify correct for weak.
- if (C->isNullValue()) {
- O << COMMDirective << name << "," << Size;
- if (COMMDirectiveTakesAlignment)
- O << "," << (1 << Align);
- O << "\t\t" << CommentString << " " << I->getName() << "\n";
- continue;
- }
-
- // Nonnull linkonce -> weak
- O << "\t.weak " << name << "\n";
- O << "\t.section\t.llvm.linkonce.d." << name << ",\"aw\",@progbits\n";
- SwitchSection("", I);
- break;
- case GlobalValue::InternalLinkage:
- if (C->isNullValue()) {
- if (LCOMMDirective) {
+ if (C->isNullValue() && /* FIXME: Verify correct */
+ (I->hasInternalLinkage() || I->hasWeakLinkage() ||
+ I->hasLinkOnceLinkage())) {
+ if (Size == 0) Size = 1; // .comm Foo, 0 is undefined, avoid it.
+ if (forDarwin) {
+ SwitchSection(".data", I);
+ if (I->hasInternalLinkage())
O << LCOMMDirective << name << "," << Size << "," << Align;
- continue;
- } else {
- SwitchSection(".bss", I);
- O << "\t.local " << name << "\n";
- O << COMMDirective << name << "," << Size;
- if (COMMDirectiveTakesAlignment)
- O << "," << (1 << Align);
- O << "\t\t# ";
- WriteAsOperand(O, I, true, true, &M);
- O << "\n";
- continue;
- }
+ else
+ O << COMMDirective << name << "," << Size;
+ } else {
+ SwitchSection(".local", I);
+ O << COMMDirective << name << "," << Size << "," << Align;
}
- SwitchSection(".data", I);
- break;
- case GlobalValue::AppendingLinkage:
- // FIXME: appending linkage variables should go into a section of
- // their name or something. For now, just emit them as external.
- case GlobalValue::ExternalLinkage:
- SwitchSection(C->isNullValue() ? ".bss" : ".data", I);
- // If external or appending, declare as a global symbol
- O << "\t.globl " << name << "\n";
- break;
- }
+ O << "\t\t" << CommentString << " '" << I->getName() << "'\n";
+ } else {
+ switch (I->getLinkage()) {
+ case GlobalValue::LinkOnceLinkage:
+ case GlobalValue::WeakLinkage:
+ if (forDarwin) {
+ O << "\t.globl " << name << '\n'
+ << "\t.weak_definition " << name << '\n';
+ SwitchSection(".section __DATA,__datacoal_nt,coalesced", I);
+ } else {
+ O << "\t.section\t.llvm.linkonce.d." << name << ",\"aw\",@progbits\n";
+ O << "\t.weak " << name << "\n";
+ }
+ break;
+ case GlobalValue::AppendingLinkage:
+ // FIXME: appending linkage variables should go into a section of
+ // their name or something. For now, just emit them as external.
+ case GlobalValue::ExternalLinkage:
+ // If external or appending, declare as a global symbol
+ O << "\t.globl " << name << "\n";
+ // FALL THROUGH
+ case GlobalValue::InternalLinkage:
+ SwitchSection(".data", I);
+ break;
+ default:
+ assert(0 && "Unknown linkage type!");
+ }
- EmitAlignment(Align);
- if (HasDotTypeDotSizeDirective) {
- O << "\t.type " << name << ",@object\n";
- O << "\t.size " << name << "," << Size << "\n";
+ EmitAlignment(Align, I);
+ O << name << ":\t\t\t\t" << CommentString << " '" << I->getName()
+ << "'\n";
+ EmitGlobalConstant(C);
+ O << '\n';
}
- O << name << ":\t\t\t" << CommentString << ' ' << I->getName() << '\n';
- EmitGlobalConstant(C);
}
if (forDarwin) {
SwitchSection("", 0);
- // Output stubs for external global variables
- if (GVStubs.begin() != GVStubs.end())
- O << "\t.non_lazy_symbol_pointer\n";
- for (std::set<std::string>::iterator i = GVStubs.begin(), e = GVStubs.end();
- i != e; ++i) {
- O << "L" << *i << "$non_lazy_ptr:\n";
- O << "\t.indirect_symbol " << *i << "\n";
- O << "\t.long\t0\n";
- }
// Output stubs for dynamically-linked functions
unsigned j = 1;
for (std::set<std::string>::iterator i = FnStubs.begin(), e = FnStubs.end();
i != e; ++i, ++j) {
- O << "\t.symbol_stub\n";
+ SwitchSection(".section __IMPORT,__jump_table,symbol_stubs,"
+ "self_modifying_code+pure_instructions,5", 0);
O << "L" << *i << "$stub:\n";
O << "\t.indirect_symbol " << *i << "\n";
- O << "\tjmp\t*L" << j << "$lz\n";
- O << "L" << *i << "$stub_binder:\n";
- O << "\tpushl\t$L" << j << "$lz\n";
- O << "\tjmp\tdyld_stub_binding_helper\n";
- O << "\t.section __DATA, __la_sym_ptr3,lazy_symbol_pointers\n";
- O << "L" << j << "$lz:\n";
- O << "\t.indirect_symbol " << *i << "\n";
- O << "\t.long\tL" << *i << "$stub_binder\n";
+ O << "\thlt ; hlt ; hlt ; hlt ; hlt\n";
}
O << "\n";
- // Output stubs for link-once variables
- if (LinkOnceStubs.begin() != LinkOnceStubs.end())
- O << ".data\n.align 2\n";
- for (std::set<std::string>::iterator i = LinkOnceStubs.begin(),
- e = LinkOnceStubs.end(); i != e; ++i) {
- O << "L" << *i << "$non_lazy_ptr:\n"
- << "\t.long\t" << *i << '\n';
+ // Output stubs for external and common global variables.
+ if (GVStubs.begin() != GVStubs.end())
+ SwitchSection(".section __IMPORT,__pointers,non_lazy_symbol_pointers", 0);
+ for (std::set<std::string>::iterator i = GVStubs.begin(), e = GVStubs.end();
+ i != e; ++i) {
+ O << "L" << *i << "$non_lazy_ptr:\n";
+ O << "\t.indirect_symbol " << *i << "\n";
+ O << "\t.long\t0\n";
}
}