Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Commit f09f195

Browse files
committed
Use log to print out a verbose message.
git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@324688 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent ea7c4e1 commit f09f195

4 files changed

+8
-8
lines changed

ELF/AArch64ErrataFix.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -555,10 +555,8 @@ static void implementPatch(uint64_t AdrpAddr, uint64_t PatcheeOffset,
555555
if (RelIt != IS->Relocations.end() && RelIt->Type == R_AARCH64_JUMP26)
556556
return;
557557

558-
559-
if (errorHandler().Verbose)
560-
message("detected cortex-a53-843419 erratum sequence starting at " +
561-
utohexstr(AdrpAddr) + " in unpatched output.");
558+
log("detected cortex-a53-843419 erratum sequence starting at " +
559+
utohexstr(AdrpAddr) + " in unpatched output.");
562560

563561
auto *PS = make<Patch843419Section>(IS, PatcheeOffset);
564562
Patches.push_back(PS);

test/ELF/aarch64-cortex-a53-843419-address.s

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
// RUN: .text : { *(.text) *(.text.*) *(.newisd) } \
55
// RUN: .text2 : { *.(newos) } \
66
// RUN: .data : { *(.data) } }" > %t.script
7-
// RUN: ld.lld --script %t.script -fix-cortex-a53-843419 -verbose %t.o -o %t2 | FileCheck -check-prefix=CHECK-PRINT %s
7+
// RUN: ld.lld --script %t.script -fix-cortex-a53-843419 -verbose %t.o -o %t2 2>&1 \
8+
// RUN: | FileCheck -check-prefix=CHECK-PRINT %s
89
// RUN: llvm-objdump -triple=aarch64-linux-gnu -d %t2 | FileCheck %s
910

1011
// Test cases for Cortex-A53 Erratum 843419 that involve interactions

test/ELF/aarch64-cortex-a53-843419-recognize.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// REQUIRES: aarch64
22
// RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux %s -o %t.o
3-
// RUN: ld.lld -fix-cortex-a53-843419 -verbose %t.o -o %t2 | FileCheck -check-prefix CHECK-PRINT %s
3+
// RUN: ld.lld -fix-cortex-a53-843419 -verbose %t.o -o %t2 2>&1 | FileCheck -check-prefix CHECK-PRINT %s
44
// RUN: llvm-objdump -triple=aarch64-linux-gnu -d %t2 | FileCheck %s -check-prefixes=CHECK,CHECK-FIX
5-
// RUN: ld.lld -verbose %t.o -o %t3
5+
// RUN: ld.lld %t.o -o %t3
66
// RUN: llvm-objdump -triple=aarch64-linux-gnu -d %t3 | FileCheck %s -check-prefixes=CHECK,CHECK-NOFIX
77
// Test cases for Cortex-A53 Erratum 843419
88
// See ARM-EPM-048406 Cortex_A53_MPCore_Software_Developers_Errata_Notice.pdf

test/ELF/aarch64-cortex-a53-843419-thunk.s

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
// RUN: echo "SECTIONS { \
44
// RUN: .text1 0x10000 : { *(.text.01) *(.text.02) *(.text.03) } \
55
// RUN: .text2 0x8010000 : { *(.text.04) } } " > %t.script
6-
// RUN: ld.lld --script %t.script -fix-cortex-a53-843419 -verbose %t.o -o %t2 | FileCheck -check-prefix=CHECK-PRINT %s
6+
// RUN: ld.lld --script %t.script -fix-cortex-a53-843419 -verbose %t.o -o %t2 2>&1 \
7+
// RUN: | FileCheck -check-prefix=CHECK-PRINT %s
78
// RUN: llvm-objdump -triple=aarch64-linux-gnu -d %t2 | FileCheck %s
89

910
// %t2 is 128 Megabytes, so delete it early.

0 commit comments

Comments
 (0)