Address comments

Created using spr 1.3.6-beta.1

Author: pcc

lld/ELF/Options.td

@@ -59,7 +59,7 @@ def build_id: J<"build-id=">, HelpText<"Generate build ID note">,
   MetaVarName<"[fast,md5,sha1,uuid,0x<hexstring>]">;
 def : F<"build-id">, Alias<build_id>, AliasArgs<["sha1"]>, HelpText<"Alias for --build-id=sha1">;
 
-defm branch_to_branch: B<"branch-to-branch",
+defm branch_to_branch: BB<"branch-to-branch",
     "Enable branch-to-branch optimization (default at -O2)",
     "Disable branch-to-branch optimization (default at -O0 and -O1)">;
 

lld/test/ELF/aarch64-branch-to-branch.s

@@ -5,21 +5,21 @@
 
 # RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t --branch-to-branch
-# RUN: llvm-objdump -d -s %t | FileCheck --check-prefix=B2B %s
+# RUN: llvm-objdump -d -s %t | FileCheck --check-prefixes=CHECK,B2B %s
 # RUN: ld.lld %t.o -o %t -O2
-# RUN: llvm-objdump -d -s %t | FileCheck --check-prefix=B2B %s
+# RUN: llvm-objdump -d -s %t | FileCheck --check-prefixes=CHECK,B2B %s
 
 ## Test that branch-to-branch is disabled by default.
 
 # RUN: ld.lld %t.o -o %t
-# RUN: llvm-objdump -d -s %t | FileCheck --check-prefix=NOB2B %s
+# RUN: llvm-objdump -d -s %t | FileCheck --check-prefixes=CHECK,NOB2B %s
 # RUN: ld.lld %t.o -o %t -O2 --no-branch-to-branch
-# RUN: llvm-objdump -d -s %t | FileCheck --check-prefix=NOB2B %s
+# RUN: llvm-objdump -d -s %t | FileCheck --check-prefixes=CHECK,NOB2B %s
 
 ## Test that branch-to-branch is disabled for preemptible symbols.
 
 # RUN: ld.lld %t.o -o %t --branch-to-branch -shared
-# RUN: llvm-objdump -d -s %t | FileCheck --check-prefix=NOB2B %s
+# RUN: llvm-objdump -d -s %t | FileCheck --check-prefixes=CHECK,NOB2B %s
 
 .section .rodata.vtable,"a"
 .globl vtable
@@ -34,6 +34,7 @@ vtable:
 
 .section .text._start,"ax"
 .globl _start
+# CHECK: <_start>:
 _start:
 # B2B: bl {{.*}} <f3>
 # NOB2B: bl {{.*}} <f1{{.*}}>
@@ -49,7 +50,9 @@ b f2
 
 .section .text.f2,"ax"
 .globl f2
+# CHECK: <f2>:
 f2:
+# CHECK-NEXT: b {{.*}} <f3{{.*}}>
 b f3
 
 .section .text.f3,"ax"

lld/test/ELF/x86-64-branch-to-branch.s

@@ -5,21 +5,21 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t --branch-to-branch
-# RUN: llvm-objdump -d -s %t | FileCheck --check-prefix=B2B %s
+# RUN: llvm-objdump -d -s %t | FileCheck --check-prefixes=CHECK,B2B %s
 # RUN: ld.lld %t.o -o %t -O2
-# RUN: llvm-objdump -d -s %t | FileCheck --check-prefix=B2B %s
+# RUN: llvm-objdump -d -s %t | FileCheck --check-prefixes=CHECK,B2B %s
 
 ## Test that branch-to-branch is disabled by default.
 
 # RUN: ld.lld %t.o -o %t
-# RUN: llvm-objdump -d -s %t | FileCheck --check-prefix=NOB2B %s
+# RUN: llvm-objdump -d -s %t | FileCheck --check-prefixes=CHECK,NOB2B %s
 # RUN: ld.lld %t.o -o %t -O2 --no-branch-to-branch
-# RUN: llvm-objdump -d -s %t | FileCheck --check-prefix=NOB2B %s
+# RUN: llvm-objdump -d -s %t | FileCheck --check-prefixes=CHECK,NOB2B %s
 
 ## Test that branch-to-branch is disabled for preemptible symbols.
 
 # RUN: ld.lld %t.o -o %t --branch-to-branch -shared
-# RUN: llvm-objdump -d -s %t | FileCheck --check-prefix=NOB2B %s
+# RUN: llvm-objdump -d -s %t | FileCheck --check-prefixes=CHECK,NOB2B %s
 
 .section .rodata.vtable,"a"
 .globl vtable
@@ -34,12 +34,13 @@ vtable:
 
 .section .text._start,"ax"
 .globl _start
+# CHECK: <_start>:
 _start:
-# B2B: jmp {{.*}} <f3>
-# NOB2B: jmp {{.*}} <f1{{.*}}>
+# B2B-NEXT: jmp {{.*}} <f3>
+# NOB2B-NEXT: jmp {{.*}} <f1{{.*}}>
 jmp f1
-# B2B: jmp {{.*}} <f3>
-# NOB2B: jmp {{.*}} <f2{{.*}}>
+# B2B-NEXT: jmp {{.*}} <f3>
+# NOB2B-NEXT: jmp {{.*}} <f2{{.*}}>
 jmp f2
 
 .section .text.f1,"ax"
@@ -49,7 +50,9 @@ jmp f2
 
 .section .text.f2,"ax"
 .globl f2
+# CHECK: <f2>:
 f2:
+# CHECK-NEXT: jmp {{.*}} <f3{{.*}}>
 jmp f3
 
 .section .text.f3,"ax"