Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lld/test/ELF/lto/linker-script-symbols-ipo.ll
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
; NOIPO: <foo>:
; NOIPO-NEXT: movl $2, %eax
; NOIPO: <_start>:
; NOIPO-NEXT: jmp 0x201160 <foo>
; NOIPO-NEXT: jmp 0x201158 <foo>

target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
Expand Down
16 changes: 14 additions & 2 deletions llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -977,8 +977,20 @@ void AsmPrinter::emitFunctionHeader() {
emitVisibility(CurrentFnSym, F.getVisibility());

emitLinkage(&F, CurrentFnSym);
if (MAI->hasFunctionAlignment())
emitAlignment(MF->getPreferredAlignment(), &F);
if (MAI->hasFunctionAlignment()) {
// The preferred alignment directive will not have the intended effect
// unless function sections are enabled.
if (MAI->useIntegratedAssembler() && MAI->hasPreferredAlignment() &&
TM.getFunctionSections()) {
Align Alignment = MF->getAlignment();
Align PrefAlignment = MF->getPreferredAlignment();
emitAlignment(Alignment, &F);
if (Alignment != PrefAlignment)
OutStreamer->emitPrefAlign(PrefAlignment);
} else {
emitAlignment(MF->getPreferredAlignment(), &F);
}
}

if (MAI->hasDotTypeDotSizeDirective())
OutStreamer->emitSymbolAttribute(CurrentFnSym, MCSA_ELF_TypeFunction);
Expand Down
27 changes: 27 additions & 0 deletions llvm/test/CodeGen/X86/prefalign.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
; RUN: llc < %s | FileCheck --check-prefixes=CHECK,NOFS %s
; RUN: llc -function-sections < %s | FileCheck --check-prefixes=CHECK,FS %s

target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"

; CHECK: .globl f1
; NOFS-NEXT: .p2align 4
; FS-NEXT: .prefalign 16
define void @f1() {
ret void
}

; CHECK: .globl f2
; CHECK-NOT: .prefalign
; CHECK-NOT: .p2align
define void @f2() prefalign 1 {
ret void
}

; CHECK: .globl f3
; NOFS-NEXT: .p2align 2
; FS-NEXT: .p2align 1
; FS-NEXT: .prefalign 4
define void @f3() align 2 prefalign 4 {
ret void
}
4 changes: 2 additions & 2 deletions llvm/test/Transforms/SampleProfile/pseudo-probe-emit.ll
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ entry:
; CHECK-SEC-ELF: [Nr] Name Type {{.*}} ES Flg Lk Inf Al
; CHECK-SEC-ELF: [ 3] .text.foo PROGBITS {{.*}} 00 AX 0 0 16
; CHECK-SEC-ELF: [ 5] .text.foo2 PROGBITS {{.*}} 00 AX 0 0 16
; CHECK-SEC-ELF: [ 8] .text.foo3 PROGBITS {{.*}} 00 AXG 0 0 16
; CHECK-SEC-ELF: [ 8] .text.foo3 PROGBITS {{.*}} 00 AXG 0 0 1
; CHECK-SEC-ELF-COUNT-3: .pseudo_probe_desc PROGBITS
; CHECK-SEC-ELF: .pseudo_probe PROGBITS {{.*}} 00 L 3 0 1
; CHECK-SEC-ELF-NEXT: .pseudo_probe PROGBITS {{.*}} 00 L 5 0 1
Expand All @@ -154,7 +154,7 @@ entry:
; CHECK-SEC2-ELF: [Nr] Name Type {{.*}} ES Flg Lk Inf Al
; CHECK-SEC2-ELF: [ 3] .text PROGBITS {{.*}} 00 AX 0 0 16
; CHECK-SEC2-ELF: [ 5] .text PROGBITS {{.*}} 00 AX 0 0 16
; CHECK-SEC2-ELF: [ 8] .text PROGBITS {{.*}} 00 AXG 0 0 16
; CHECK-SEC2-ELF: [ 8] .text PROGBITS {{.*}} 00 AXG 0 0 1
; CHECK-SEC2-ELF-COUNT-3: .pseudo_probe_desc PROGBITS
; CHECK-SEC2-ELF: .pseudo_probe PROGBITS {{.*}} 00 L 3 0 1
; CHECK-SEC2-ELF-NEXT: .pseudo_probe PROGBITS {{.*}} 00 L 5 0 1
Expand Down
Loading