[llvm] f28408f - [test] Remove CHECK lines for MCAsmStreamer's fixup output

Fangrui Song via llvm-commits llvm-commits at lists.llvm.org
Thu Apr 17 22:29:48 PDT 2025


Author: Fangrui Song
Date: 2025-04-17T22:29:42-07:00
New Revision: f28408f3af0d4533dd1d8048c5fdcdb14b934d05

URL: https://github.com/llvm/llvm-project/commit/f28408f3af0d4533dd1d8048c5fdcdb14b934d05
DIFF: https://github.com/llvm/llvm-project/commit/f28408f3af0d4533dd1d8048c5fdcdb14b934d05.diff

LOG: [test] Remove CHECK lines for MCAsmStreamer's fixup output

The fixup output is a debug aid and should not be used to test
target-specific relocation generation implementation. The llvm-mc
-filetype=obj output is what truly matters.

Added: 
    

Modified: 
    llvm/test/MC/AVR/inst-adiw.s
    llvm/test/MC/AVR/inst-andi.s
    llvm/test/MC/AVR/inst-brbc.s
    llvm/test/MC/AVR/inst-brbs.s
    llvm/test/MC/AVR/inst-brcc.s
    llvm/test/MC/AVR/inst-brcs.s
    llvm/test/MC/AVR/inst-breq.s
    llvm/test/MC/AVR/inst-brge.s
    llvm/test/MC/AVR/inst-brhc.s
    llvm/test/MC/AVR/inst-brhs.s
    llvm/test/MC/AVR/inst-brid.s
    llvm/test/MC/AVR/inst-brie.s
    llvm/test/MC/AVR/inst-brlo.s
    llvm/test/MC/AVR/inst-brlt.s
    llvm/test/MC/AVR/inst-brmi.s
    llvm/test/MC/AVR/inst-brne.s
    llvm/test/MC/AVR/inst-brpl.s
    llvm/test/MC/AVR/inst-brsh.s
    llvm/test/MC/AVR/inst-brtc.s
    llvm/test/MC/AVR/inst-brts.s
    llvm/test/MC/AVR/inst-brvc.s
    llvm/test/MC/AVR/inst-brvs.s
    llvm/test/MC/AVR/inst-call.s
    llvm/test/MC/AVR/inst-cbi.s
    llvm/test/MC/AVR/inst-cpi.s
    llvm/test/MC/AVR/inst-in.s
    llvm/test/MC/AVR/inst-jmp.s
    llvm/test/MC/AVR/inst-ldd.s
    llvm/test/MC/AVR/inst-ldi.s
    llvm/test/MC/AVR/inst-lds-tiny.s
    llvm/test/MC/AVR/inst-lds.s
    llvm/test/MC/AVR/inst-ori.s
    llvm/test/MC/AVR/inst-out.s
    llvm/test/MC/AVR/inst-rcall.s
    llvm/test/MC/AVR/inst-rjmp.s
    llvm/test/MC/AVR/inst-sbci.s
    llvm/test/MC/AVR/inst-sbi.s
    llvm/test/MC/AVR/inst-sbic.s
    llvm/test/MC/AVR/inst-sbis.s
    llvm/test/MC/AVR/inst-sbiw.s
    llvm/test/MC/AVR/inst-sbr.s
    llvm/test/MC/AVR/inst-std.s
    llvm/test/MC/AVR/inst-sts-tiny.s
    llvm/test/MC/AVR/inst-sts.s
    llvm/test/MC/AVR/inst-subi.s
    llvm/test/MC/AVR/modifiers.s
    llvm/test/MC/CSKY/basic-16bit.s
    llvm/test/MC/CSKY/basic.s
    llvm/test/MC/Sparc/sparc-assembly-exprs.s
    llvm/test/MC/Sparc/sparc-ctrl-instructions.s
    llvm/test/MC/Sparc/sparc-little-endian.s
    llvm/test/MC/Sparc/sparc-relocations.s
    llvm/test/MC/Sparc/sparc-synthetic-instructions.s
    llvm/test/MC/Sparc/sparc-tls-relocations.s
    llvm/test/MC/Sparc/sparc64-ctrl-instructions.s
    llvm/test/MC/Sparc/sparcv9-synthetic-instructions.s

Removed: 
    


################################################################################
diff  --git a/llvm/test/MC/AVR/inst-adiw.s b/llvm/test/MC/AVR/inst-adiw.s
index 6b83027234c11..27df92f48d680 100644
--- a/llvm/test/MC/AVR/inst-adiw.s
+++ b/llvm/test/MC/AVR/inst-adiw.s
@@ -30,9 +30,7 @@ foo:
 ; CHECK: adiw r30,  0                ; encoding: [0x30,0x96]
 
 ; CHECK: adiw r24, SYMBOL            ; encoding: [0b00AAAAAA,0x96]
-                                     ;   fixup A - offset: 0, value: SYMBOL, kind: fixup_6_adiw
 ; CHECK: adiw r24, r25               ; encoding: [0b00AAAAAA,0x96]
-                                     ;   fixup A - offset: 0, value: r25, kind: fixup_6_adiw
 
 ; CHECK-INST: adiw r26,  12
 ; CHECK-INST: adiw r26,  63

diff  --git a/llvm/test/MC/AVR/inst-andi.s b/llvm/test/MC/AVR/inst-andi.s
index 14f85bbd66010..1835dcd189eb6 100644
--- a/llvm/test/MC/AVR/inst-andi.s
+++ b/llvm/test/MC/AVR/inst-andi.s
@@ -15,7 +15,6 @@ foo:
 ; CHECK: andi r27, 92                  ; encoding: [0xbc,0x75]
 
 ; CHECK: andi r20, BAR                 ; encoding: [0x40'A',0x70]
-; CHECK:                               ;   fixup A - offset: 0, value: BAR, kind: fixup_ldi
 
 ; CHECK-INST: andi r16, 255
 ; CHECK-INST: andi r29, 190

diff  --git a/llvm/test/MC/AVR/inst-brbc.s b/llvm/test/MC/AVR/inst-brbc.s
index 6aa6ed0863e0c..6d96393b42ad1 100644
--- a/llvm/test/MC/AVR/inst-brbc.s
+++ b/llvm/test/MC/AVR/inst-brbc.s
@@ -11,10 +11,8 @@ foo:
   .short 0xf4c7
 
 ; CHECK: brvc .Ltmp0+8+2   ; encoding: [0bAAAAA011,0b111101AA]
-; CHECK-NEXT:                ; fixup A - offset: 0, value: .Ltmp0+8+2, kind: fixup_7_pcrel
 ;
 ; CHECK: brcc .Ltmp1-16+2  ; encoding: [0bAAAAA000,0b111101AA]
-; CHECK-NEXT:                ; fixup A - offset: 0, value: .Ltmp1-16+2, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 23 f4   brvc .+8

diff  --git a/llvm/test/MC/AVR/inst-brbs.s b/llvm/test/MC/AVR/inst-brbs.s
index abadd10a134f8..9dde5e16abde3 100644
--- a/llvm/test/MC/AVR/inst-brbs.s
+++ b/llvm/test/MC/AVR/inst-brbs.s
@@ -11,9 +11,7 @@ foo:
   .short 0xf077
 
 ; CHECK: brvs .Ltmp0+8+2   ; encoding: [0bAAAAA011,0b111100AA]
-; CHECK-NEXT:                ; fixup A - offset: 0, value: .Ltmp0+8+2, kind: fixup_7_pcrel
 ; CHECK: brcs .Ltmp1-12+2  ; encoding: [0bAAAAA000,0b111100AA]
-; CHECK-NEXT:                ; fixup A - offset: 0, value: .Ltmp1-12+2, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 23 f0   brvs .+8

diff  --git a/llvm/test/MC/AVR/inst-brcc.s b/llvm/test/MC/AVR/inst-brcc.s
index 90d7dc3eca1b9..0edefa167ac44 100644
--- a/llvm/test/MC/AVR/inst-brcc.s
+++ b/llvm/test/MC/AVR/inst-brcc.s
@@ -13,13 +13,9 @@ foo:
 bar:
 
 ; CHECK: brcc .Ltmp0+66+2  ; encoding: [0bAAAAA000,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp0+66+2, kind: fixup_7_pcrel
 ; CHECK: brcc .Ltmp1-22+2  ; encoding: [0bAAAAA000,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp1-22+2, kind: fixup_7_pcrel
 ; CHECK: brcc .Ltmp2+66+2  ; encoding: [0bAAAAA000,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp2+66+2, kind: fixup_7_pcrel
 ; CHECK: brcc bar            ; encoding: [0bAAAAA000,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 08 f5      brsh .+66

diff  --git a/llvm/test/MC/AVR/inst-brcs.s b/llvm/test/MC/AVR/inst-brcs.s
index 74cc9a1c97805..ea8a3f527c9e4 100644
--- a/llvm/test/MC/AVR/inst-brcs.s
+++ b/llvm/test/MC/AVR/inst-brcs.s
@@ -13,13 +13,9 @@ foo:
 bar:
 
 ; CHECK: brcs .Ltmp0+8+2  ; encoding: [0bAAAAA000,0b111100AA]
-; CHECK-NEXT:               ;   fixup A - offset: 0, value: .Ltmp0+8+2, kind: fixup_7_pcrel
 ; CHECK: brcs .Ltmp1+4+2  ; encoding: [0bAAAAA000,0b111100AA]
-; CHECK-NEXT:               ;   fixup A - offset: 0, value: .Ltmp1+4+2, kind: fixup_7_pcrel
 ; CHECK: brcs .Ltmp2+8+2  ; encoding: [0bAAAAA000,0b111100AA]
-; CHECK-NEXT:               ;   fixup A - offset: 0, value: .Ltmp2+8+2, kind: fixup_7_pcrel
 ; CHECK: brcs bar           ; encoding: [0bAAAAA000,0b111100AA]
-; CHECK-NEXT:               ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 20 f0      brlo .+8

diff  --git a/llvm/test/MC/AVR/inst-breq.s b/llvm/test/MC/AVR/inst-breq.s
index 51bc6192e05ed..d916f6dc18c8f 100644
--- a/llvm/test/MC/AVR/inst-breq.s
+++ b/llvm/test/MC/AVR/inst-breq.s
@@ -13,13 +13,9 @@ foo:
 bar:
 
 ; CHECK: breq    .Ltmp0-18+2     ; encoding: [0bAAAAA001,0b111100AA]
-; CHECK-NEXT:                      ;   fixup A - offset: 0, value: .Ltmp0-18+2, kind: fixup_7_pcrel
 ; CHECK: breq    .Ltmp1-12+2     ; encoding: [0bAAAAA001,0b111100AA]
-; CHECK-NEXT:                      ;   fixup A - offset: 0, value: .Ltmp1-12+2, kind: fixup_7_pcrel
 ; CHECK: brbs    1, .Ltmp2-18+2  ; encoding: [0bAAAAA001,0b111100AA]
-; CHECK-NEXT:                      ;   fixup A - offset: 0, value: .Ltmp2-18+2, kind: fixup_7_pcrel
 ; CHECK: brbs    1, bar            ; encoding: [0bAAAAA001,0b111100AA]
-; CHECK-NEXT:                      ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: b9 f3      breq .-18

diff  --git a/llvm/test/MC/AVR/inst-brge.s b/llvm/test/MC/AVR/inst-brge.s
index 904f4a496e777..3a8fd727d773e 100644
--- a/llvm/test/MC/AVR/inst-brge.s
+++ b/llvm/test/MC/AVR/inst-brge.s
@@ -12,11 +12,8 @@ foo:
 bar:
 
 ; CHECK: brge .Ltmp0+50+2  ; encoding: [0bAAAAA100,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp0+50+2, kind: fixup_7_pcrel
 ; CHECK: brge .Ltmp1+42+2  ; encoding: [0bAAAAA100,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp1+42+2, kind: fixup_7_pcrel
 ; CHECK: brge bar            ; encoding: [0bAAAAA100,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: cc f4      brge .+50

diff  --git a/llvm/test/MC/AVR/inst-brhc.s b/llvm/test/MC/AVR/inst-brhc.s
index 77052e664d389..4fc55b6ab0347 100644
--- a/llvm/test/MC/AVR/inst-brhc.s
+++ b/llvm/test/MC/AVR/inst-brhc.s
@@ -12,11 +12,8 @@ foo:
 bar:
 
 ; CHECK: brhc .Ltmp0+12+2  ; encoding: [0bAAAAA101,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp0+12+2, kind: fixup_7_pcrel
 ; CHECK: brhc .Ltmp1+14+2  ; encoding: [0bAAAAA101,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp1+14+2, kind: fixup_7_pcrel
 ; CHECK: brhc bar            ; encoding: [0bAAAAA101,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 35 f4      brhc .+12

diff  --git a/llvm/test/MC/AVR/inst-brhs.s b/llvm/test/MC/AVR/inst-brhs.s
index b4c55cafd5de9..d0968753cded2 100644
--- a/llvm/test/MC/AVR/inst-brhs.s
+++ b/llvm/test/MC/AVR/inst-brhs.s
@@ -12,11 +12,8 @@ foo:
 bar:
 
 ; CHECK: brhs .Ltmp0-66+2  ; encoding: [0bAAAAA101,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp0-66+2, kind: fixup_7_pcrel
 ; CHECK: brhs .Ltmp1+14+2  ; encoding: [0bAAAAA101,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp1+14+2, kind: fixup_7_pcrel
 ; CHECK: brhs bar            ; encoding: [0bAAAAA101,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: fd f2      brhs .-66

diff  --git a/llvm/test/MC/AVR/inst-brid.s b/llvm/test/MC/AVR/inst-brid.s
index 4cf1869dc1b2c..2a3a30f905cf5 100644
--- a/llvm/test/MC/AVR/inst-brid.s
+++ b/llvm/test/MC/AVR/inst-brid.s
@@ -12,11 +12,8 @@ foo:
 bar:
 
 ; CHECK: brid .Ltmp0+42+2  ; encoding: [0bAAAAA111,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp0+42+2, kind: fixup_7_pcrel
 ; CHECK: brid .Ltmp1+62+2  ; encoding: [0bAAAAA111,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp1+62+2, kind: fixup_7_pcrel
 ; CHECK: brid bar            ; encoding: [0bAAAAA111,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: af f4      brid .+42

diff  --git a/llvm/test/MC/AVR/inst-brie.s b/llvm/test/MC/AVR/inst-brie.s
index 7c7e97c2b201e..4f867ae99852a 100644
--- a/llvm/test/MC/AVR/inst-brie.s
+++ b/llvm/test/MC/AVR/inst-brie.s
@@ -12,11 +12,8 @@ foo:
 bar:
 
 ; CHECK: brie .Ltmp0+20+2  ; encoding: [0bAAAAA111,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp0+20+2, kind: fixup_7_pcrel
 ; CHECK: brie .Ltmp1+40+2  ; encoding: [0bAAAAA111,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp1+40+2, kind: fixup_7_pcrel
 ; CHECK: brie bar            ; encoding: [0bAAAAA111,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 57 f0      brie .+20

diff  --git a/llvm/test/MC/AVR/inst-brlo.s b/llvm/test/MC/AVR/inst-brlo.s
index 9523fd5695a99..48499aa69926b 100644
--- a/llvm/test/MC/AVR/inst-brlo.s
+++ b/llvm/test/MC/AVR/inst-brlo.s
@@ -12,11 +12,8 @@ foo:
 bar:
 
 ; CHECK: brlo .Ltmp0+12+2  ; encoding: [0bAAAAA000,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp0+12+2, kind: fixup_7_pcrel
 ; CHECK: brlo .Ltmp1+28+2  ; encoding: [0bAAAAA000,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp1+28+2, kind: fixup_7_pcrel
 ; CHECK: brlo bar            ; encoding: [0bAAAAA000,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 30 f0      brlo .+12

diff  --git a/llvm/test/MC/AVR/inst-brlt.s b/llvm/test/MC/AVR/inst-brlt.s
index c309310909fa7..e16fd05b3e144 100644
--- a/llvm/test/MC/AVR/inst-brlt.s
+++ b/llvm/test/MC/AVR/inst-brlt.s
@@ -12,11 +12,8 @@ foo:
 bar:
 
 ; CHECK: brlt .Ltmp0+16+2  ; encoding: [0bAAAAA100,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp0+16+2, kind: fixup_7_pcrel
 ; CHECK: brlt .Ltmp1+2+2   ; encoding: [0bAAAAA100,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp1+2+2, kind: fixup_7_pcrel
 ; CHECK: brlt bar            ; encoding: [0bAAAAA100,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 44 f0    brlt .+16

diff  --git a/llvm/test/MC/AVR/inst-brmi.s b/llvm/test/MC/AVR/inst-brmi.s
index ec60bc4a14f1c..0d46af8b75969 100644
--- a/llvm/test/MC/AVR/inst-brmi.s
+++ b/llvm/test/MC/AVR/inst-brmi.s
@@ -12,11 +12,8 @@ foo:
 bar:
 
 ; CHECK: brmi .Ltmp0+66+2  ; encoding: [0bAAAAA010,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp0+66+2, kind: fixup_7_pcrel
 ; CHECK: brmi .Ltmp1+58+2  ; encoding: [0bAAAAA010,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp1+58+2, kind: fixup_7_pcrel
 ; CHECK: brmi bar            ; encoding: [0bAAAAA010,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 0a f1      brmi .+66

diff  --git a/llvm/test/MC/AVR/inst-brne.s b/llvm/test/MC/AVR/inst-brne.s
index 2a424a3593247..e87813a60b504 100644
--- a/llvm/test/MC/AVR/inst-brne.s
+++ b/llvm/test/MC/AVR/inst-brne.s
@@ -13,13 +13,9 @@ foo:
 bar:
 
 ; CHECK: brne    .Ltmp0+10+2     ; encoding: [0bAAAAA001,0b111101AA]
-; CHECK-NEXT:                      ;   fixup A - offset: 0, value: .Ltmp0+10+2, kind: fixup_7_pcrel
 ; CHECK: brne    .Ltmp1+2+2      ; encoding: [0bAAAAA001,0b111101AA]
-; CHECK-NEXT:                      ;   fixup A - offset: 0, value: .Ltmp1+2+2, kind: fixup_7_pcrel
 ; CHECK: brbc    1, .Ltmp2+10+2  ; encoding: [0bAAAAA001,0b111101AA]
-; CHECK-NEXT:                      ;   fixup A - offset: 0, value: .Ltmp2+10+2, kind: fixup_7_pcrel
 ; CHECK: brbc    1, bar            ; encoding: [0bAAAAA001,0b111101AA]
-; CHECK-NEXT:                      ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 29 f4      brne .+10

diff  --git a/llvm/test/MC/AVR/inst-brpl.s b/llvm/test/MC/AVR/inst-brpl.s
index d752f34ee606b..34877961bf328 100644
--- a/llvm/test/MC/AVR/inst-brpl.s
+++ b/llvm/test/MC/AVR/inst-brpl.s
@@ -12,11 +12,8 @@ foo:
 bar:
 
 ; CHECK: brpl .Ltmp0-12+2  ; encoding: [0bAAAAA010,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp0-12+2, kind: fixup_7_pcrel
 ; CHECK: brpl .Ltmp1+18+2  ; encoding: [0bAAAAA010,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp1+18+2, kind: fixup_7_pcrel
 ; CHECK: brpl bar            ; encoding: [0bAAAAA010,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: d2 f7      brpl .-12

diff  --git a/llvm/test/MC/AVR/inst-brsh.s b/llvm/test/MC/AVR/inst-brsh.s
index 95a6a52acb60c..be0a06c445e65 100644
--- a/llvm/test/MC/AVR/inst-brsh.s
+++ b/llvm/test/MC/AVR/inst-brsh.s
@@ -12,11 +12,8 @@ foo:
 bar:
 
 ; CHECK: brsh .Ltmp0+32+2  ; encoding: [0bAAAAA000,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp0+32+2, kind: fixup_7_pcrel
 ; CHECK: brsh .Ltmp1+70+2  ; encoding: [0bAAAAA000,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp1+70+2, kind: fixup_7_pcrel
 ; CHECK: brsh bar            ; encoding: [0bAAAAA000,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 80 f4      brsh .+32

diff  --git a/llvm/test/MC/AVR/inst-brtc.s b/llvm/test/MC/AVR/inst-brtc.s
index d8704dc6f345d..312c55c3f4729 100644
--- a/llvm/test/MC/AVR/inst-brtc.s
+++ b/llvm/test/MC/AVR/inst-brtc.s
@@ -12,11 +12,8 @@ foo:
 bar:
 
 ; CHECK: brtc .Ltmp0+52+2  ; encoding: [0bAAAAA110,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp0+52+2, kind: fixup_7_pcrel
 ; CHECK: brtc .Ltmp1+50+2  ; encoding: [0bAAAAA110,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp1+50+2, kind: fixup_7_pcrel
 ; CHECK: brtc bar            ; encoding: [0bAAAAA110,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: d6 f4      brtc .+52

diff  --git a/llvm/test/MC/AVR/inst-brts.s b/llvm/test/MC/AVR/inst-brts.s
index 976f23ff8c208..40ef6af5eef16 100644
--- a/llvm/test/MC/AVR/inst-brts.s
+++ b/llvm/test/MC/AVR/inst-brts.s
@@ -12,11 +12,8 @@ foo:
 bar:
 
 ; CHECK: brts .Ltmp0+18+2  ; encoding: [0bAAAAA110,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp0+18+2, kind: fixup_7_pcrel
 ; CHECK: brts .Ltmp1+22+2  ; encoding: [0bAAAAA110,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp1+22+2, kind: fixup_7_pcrel
 ; CHECK: brts bar            ; encoding: [0bAAAAA110,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 4e f0      brts .+18

diff  --git a/llvm/test/MC/AVR/inst-brvc.s b/llvm/test/MC/AVR/inst-brvc.s
index 766146cc57aaf..d493ff1fbf544 100644
--- a/llvm/test/MC/AVR/inst-brvc.s
+++ b/llvm/test/MC/AVR/inst-brvc.s
@@ -12,11 +12,8 @@ foo:
 bar:
 
 ; CHECK: brvc .Ltmp0-28+2  ; encoding: [0bAAAAA011,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp0-28+2, kind: fixup_7_pcrel
 ; CHECK: brvc .Ltmp1-62+2  ; encoding: [0bAAAAA011,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp1-62+2, kind: fixup_7_pcrel
 ; CHECK: brvc bar            ; encoding: [0bAAAAA011,0b111101AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 93 f7      brvc .-28

diff  --git a/llvm/test/MC/AVR/inst-brvs.s b/llvm/test/MC/AVR/inst-brvs.s
index 9ebe9c3181ee9..07755d8aea21f 100644
--- a/llvm/test/MC/AVR/inst-brvs.s
+++ b/llvm/test/MC/AVR/inst-brvs.s
@@ -12,11 +12,8 @@ foo:
 bar:
 
 ; CHECK: brvs .Ltmp0+18+2  ; encoding: [0bAAAAA011,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp0+18+2, kind: fixup_7_pcrel
 ; CHECK: brvs .Ltmp1+32+2  ; encoding: [0bAAAAA011,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: .Ltmp1+32+2, kind: fixup_7_pcrel
 ; CHECK: brvs bar            ; encoding: [0bAAAAA011,0b111100AA]
-; CHECK-NEXT:                ;   fixup A - offset: 0, value: bar, kind: fixup_7_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 4b f0      brvs .+18

diff  --git a/llvm/test/MC/AVR/inst-call.s b/llvm/test/MC/AVR/inst-call.s
index 491a38346bbe0..af4f95b327cb3 100644
--- a/llvm/test/MC/AVR/inst-call.s
+++ b/llvm/test/MC/AVR/inst-call.s
@@ -15,7 +15,6 @@ r25:
 ; CHECK: call -12                   ; encoding: [0xff,0x95,0xfa,0xff]
 ; CHECK: call  0                    ; encoding: [0x0e,0x94,0x00,0x00]
 ; CHECK: call  r25                  ; encoding: [0x0e'A',0x94'A',0b00AAAAAA,0x00]
-; CHECK:                            ;   fixup A - offset: 0, value: r25, kind: fixup_call
 
 ; CHECK-INST: call 4096
 ; CHECK-INST: call 8388484

diff  --git a/llvm/test/MC/AVR/inst-cbi.s b/llvm/test/MC/AVR/inst-cbi.s
index 6fa9c46960fcd..54f4e65c10064 100644
--- a/llvm/test/MC/AVR/inst-cbi.s
+++ b/llvm/test/MC/AVR/inst-cbi.s
@@ -21,7 +21,6 @@ foo:
 ; CHECK: cbi 31, 7                 ; encoding: [0xff,0x98]
 
 ; CHECK: cbi bar-2, 2              ; encoding: [0bAAAAA010,0x98]
-; CHECK:                           ;   fixup A - offset: 0, value: bar-2, kind: fixup_port5
 
 ; CHECK-INST: cbi 3, 5
 ; CHECK-INST: cbi 1, 1

diff  --git a/llvm/test/MC/AVR/inst-cpi.s b/llvm/test/MC/AVR/inst-cpi.s
index e17b505e791c5..1c29f6231dd24 100644
--- a/llvm/test/MC/AVR/inst-cpi.s
+++ b/llvm/test/MC/AVR/inst-cpi.s
@@ -15,7 +15,6 @@ foo:
 ; CHECK: cpi r27, 92                   ; encoding: [0xbc,0x35]
 
 ; CHECK: cpi r21, ear                  ; encoding: [0x50'A',0x30]
-; CHECK:                               ;   fixup A - offset: 0, value: ear, kind: fixup_ldi
 
 ; CHECK-INST: cpi r16, 241
 ; CHECK-INST: cpi r29, 190

diff  --git a/llvm/test/MC/AVR/inst-in.s b/llvm/test/MC/AVR/inst-in.s
index e17f25b67d03d..87b5874b602a1 100644
--- a/llvm/test/MC/AVR/inst-in.s
+++ b/llvm/test/MC/AVR/inst-in.s
@@ -21,7 +21,6 @@ foo:
 ; CHECK: in r31, 63                 ; encoding: [0xff,0xb7]
 
 ; CHECK: in r20, foo+1              ; encoding: [0x40'A',0xb1'A']
-; CHECK:                            ;   fixup A - offset: 0, value: foo+1, kind: fixup_port6
 
 ; CHECK-INST: in r2, 4
 ; CHECK-INST: in r9, 6

diff  --git a/llvm/test/MC/AVR/inst-jmp.s b/llvm/test/MC/AVR/inst-jmp.s
index 0d5b16e02206d..2e992ddb0e91d 100644
--- a/llvm/test/MC/AVR/inst-jmp.s
+++ b/llvm/test/MC/AVR/inst-jmp.s
@@ -19,7 +19,6 @@ foo:
 ; CHECK: jmp  0                    ; encoding: [0x0c,0x94,0x00,0x00]
 
 ; CHECK: jmp foo+1                 ; encoding: [0x0c'A',0x94'A',0b00AAAAAA,0x00]
-; CHECK:                           ;   fixup A - offset: 0, value: foo+1, kind: fixup_call
 
 ; CHECK: jmp 262142                ; encoding: [0x0d,0x94,0xff,0xff]
 ; CHECK: jmp 8126464               ; encoding: [0xfc,0x95,0x00,0x00]

diff  --git a/llvm/test/MC/AVR/inst-ldd.s b/llvm/test/MC/AVR/inst-ldd.s
index 70ba44617690e..2c6fdd25cdb00 100644
--- a/llvm/test/MC/AVR/inst-ldd.s
+++ b/llvm/test/MC/AVR/inst-ldd.s
@@ -18,7 +18,6 @@ foo:
 ; CHECK: ldd r7, Z+30                 ; encoding: [0x76,0x8c]
 
 ; CHECK: ldd r9, Z+foo                ; encoding: [0x90'A',0x80'A']
-; CHECK:                              ;   fixup A - offset: 0, value: +foo, kind: fixup_6
 
 ; INST: ldd r2, Y+2
 ; INST: ldd r0, Y+0

diff  --git a/llvm/test/MC/AVR/inst-ldi.s b/llvm/test/MC/AVR/inst-ldi.s
index a6e2bc68b59e0..abdac26c4bd33 100644
--- a/llvm/test/MC/AVR/inst-ldi.s
+++ b/llvm/test/MC/AVR/inst-ldi.s
@@ -14,7 +14,6 @@ foo:
 ; CHECK: ldi r27, 92                  ; encoding: [0xbc,0xe5]
 
 ; CHECK: ldi r21, SYMBOL+3            ; encoding: [0x50'A',0xe0]
-; CHECK:                              ;   fixup A - offset: 0, value: SYMBOL+3, kind: fixup_ldi
 
 ; CHECK-INST: ldi r16, 241
 ; CHECK-INST: ldi r29, 190

diff  --git a/llvm/test/MC/AVR/inst-lds-tiny.s b/llvm/test/MC/AVR/inst-lds-tiny.s
index 045cbea24b1e9..1cb8ac47a56d2 100644
--- a/llvm/test/MC/AVR/inst-lds-tiny.s
+++ b/llvm/test/MC/AVR/inst-lds-tiny.s
@@ -15,11 +15,8 @@ foo:
 ; CHECK:  lds r22, 44                  ; encoding: [0x6c,0xa2]
 ; CHECK:  lds r27, 92                  ; encoding: [0xbc,0xa5]
 ; CHECK:  lds r20, SYMBOL+12           ; encoding: [0x40'A',0xa0'A']
-; CHECK:                               ; fixup A - offset: 0, value: SYMBOL+12, kind: fixup_lds_sts_16
 ; CHECK:  lds r20, r21                 ; encoding: [0x40'A',0xa0'A']
-; CHECK:                               ; fixup A - offset: 0, value: r21, kind: fixup_lds_sts_16
 ; CHECK:  lds r20, z+6                 ; encoding: [0x40'A',0xa0'A']
-; CHECK:                               ; fixup A - offset: 0, value: z+6, kind: fixup_lds_sts_16
 
 ; CHECK-INST: lds r16, 113
 ; CHECK-INST: lds r29, 62

diff  --git a/llvm/test/MC/AVR/inst-lds.s b/llvm/test/MC/AVR/inst-lds.s
index 38f641a07ca79..0d2e20685c702 100644
--- a/llvm/test/MC/AVR/inst-lds.s
+++ b/llvm/test/MC/AVR/inst-lds.s
@@ -15,11 +15,8 @@ foo:
 ; CHECK: lds r22, 172                 ; encoding: [0x60,0x91,0xac,0x00]
 ; CHECK: lds r27, 92                  ; encoding: [0xb0,0x91,0x5c,0x00]
 ; CHECK: lds r4,  SYMBOL+12           ; encoding: [0x40,0x90,A,A]
-; CHECK:                              ;   fixup A - offset: 2, value: SYMBOL+12, kind: fixup_16
 ; CHECK: lds r4,  r25                 ; encoding: [0x40,0x90,A,A]
-; CHECK:                              ;   fixup A - offset: 2, value: r25, kind: fixup_16
 ; CHECK: lds r4,  x+2                 ; encoding: [0x40,0x90,A,A]
-; CHECK:                              ;   fixup A - offset: 2, value: x+2, kind: fixup_16
 
 ; CHECK-INST: lds r16, 241
 ; CHECK-INST: lds r29, 190

diff  --git a/llvm/test/MC/AVR/inst-ori.s b/llvm/test/MC/AVR/inst-ori.s
index bdbe510b1504a..8406656a79021 100644
--- a/llvm/test/MC/AVR/inst-ori.s
+++ b/llvm/test/MC/AVR/inst-ori.s
@@ -15,7 +15,6 @@ foo:
 ; CHECK: ori r31, 0             ; encoding: [0xf0,0x60]
 
 ; CHECK: ori r16, FOOBAR        ; encoding: [A,0x60]
-; CHECK:                        ;   fixup A - offset: 0, value: FOOBAR, kind: fixup_ldi
 
 ; CHECK-INST: ori r17, 208
 ; CHECK-INST: ori r24, 190

diff  --git a/llvm/test/MC/AVR/inst-out.s b/llvm/test/MC/AVR/inst-out.s
index 76dac1d578be5..8c84918f8bb07 100644
--- a/llvm/test/MC/AVR/inst-out.s
+++ b/llvm/test/MC/AVR/inst-out.s
@@ -21,7 +21,6 @@ foo:
 ; CHECK: out 63, r31                 ; encoding: [0xff,0xbf]
 
 ; CHECK: out bar-8, r29              ; encoding: [0xd0'A',0xb9'A']
-; CHECK:                             ;   fixup A - offset: 0, value: bar-8, kind: fixup_port6
 
 ; CHECK-INST: out 4,  r2
 ; CHECK-INST: out 6,  r9

diff  --git a/llvm/test/MC/AVR/inst-rcall.s b/llvm/test/MC/AVR/inst-rcall.s
index d0a9e6b7b0463..1da6e7f5dddf9 100644
--- a/llvm/test/MC/AVR/inst-rcall.s
+++ b/llvm/test/MC/AVR/inst-rcall.s
@@ -12,13 +12,9 @@ foo:
   .short  0xdfea
 
 ; CHECK: rcall .Ltmp0+0+2   ; encoding: [A,0b1101AAAA]
-; CHECK-NEXT:                 ;   fixup A - offset: 0, value: .Ltmp0+0+2, kind: fixup_13_pcrel
 ; CHECK: rcall .Ltmp1-8+2   ; encoding: [A,0b1101AAAA]
-; CHECK-NEXT:                 ;   fixup A - offset: 0, value: .Ltmp1-8+2, kind: fixup_13_pcrel
 ; CHECK: rcall .Ltmp2+12+2  ; encoding: [A,0b1101AAAA]
-; CHECK-NEXT:                 ;   fixup A - offset: 0, value: .Ltmp2+12+2, kind: fixup_13_pcrel
 ; CHECK: rcall .Ltmp3+46+2  ; encoding: [A,0b1101AAAA]
-; CHECK-NEXT:                 ;   fixup A - offset: 0, value: .Ltmp3+46+2, kind: fixup_13_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 00 d0    rcall .+0

diff  --git a/llvm/test/MC/AVR/inst-rjmp.s b/llvm/test/MC/AVR/inst-rjmp.s
index 8971ff7ddcd8a..6712319bbc268 100644
--- a/llvm/test/MC/AVR/inst-rjmp.s
+++ b/llvm/test/MC/AVR/inst-rjmp.s
@@ -22,25 +22,15 @@ x:
   rjmp .+4094
 
 ; CHECK: rjmp .Ltmp0+2+2    ; encoding: [A,0b1100AAAA]
-; CHECK-NEXT:                 ;   fixup A - offset: 0, value: .Ltmp0+2+2, kind: fixup_13_pcrel
 ; CHECK: rjmp .Ltmp1-2+2    ; encoding: [A,0b1100AAAA]
-; CHECK-NEXT:                 ;   fixup A - offset: 0, value: .Ltmp1-2+2, kind: fixup_13_pcrel
 ; CHECK: rjmp foo             ; encoding: [A,0b1100AAAA]
-; CHECK-NEXT:                 ;   fixup A - offset: 0, value: foo, kind: fixup_13_pcrel
 ; CHECK: rjmp .Ltmp2+8+2    ; encoding: [A,0b1100AAAA]
-; CHECK-NEXT:                 ;   fixup A - offset: 0, value: .Ltmp2+8+2, kind: fixup_13_pcrel
 ; CHECK: rjmp end             ; encoding: [A,0b1100AAAA]
-; CHECK-NEXT:                 ;   fixup A - offset: 0, value: end, kind: fixup_13_pcrel
 ; CHECK: rjmp .Ltmp3+0+2    ; encoding: [A,0b1100AAAA]
-; CHECK-NEXT:                 ;   fixup A - offset: 0, value: .Ltmp3+0+2, kind: fixup_13_pcrel
 ; CHECK: rjmp .Ltmp4-4+2    ; encoding: [A,0b1100AAAA]
-; CHECK-NEXT:                 ;   fixup A - offset: 0, value: .Ltmp4-4+2, kind: fixup_13_pcrel
 ; CHECK: rjmp .Ltmp5-6+2    ; encoding: [A,0b1100AAAA]
-; CHECK-NEXT:                 ;   fixup A - offset: 0, value: .Ltmp5-6+2, kind: fixup_13_pcrel
 ; CHECK: rjmp x               ; encoding: [A,0b1100AAAA]
-; CHECK-NEXT:                 ;   fixup A - offset: 0, value: x, kind: fixup_13_pcrel
 ; CHECK: rjmp .Ltmp6+4094+2 ; encoding: [A,0b1100AAAA]
-; CHECK-NEXT:                 ;   fixup A - offset: 0, value: .Ltmp6+4094+2, kind: fixup_13_pcrel
 
 ; INST-LABEL: <foo>:
 ; INST-NEXT: 01 c0      rjmp  .+2

diff  --git a/llvm/test/MC/AVR/inst-sbci.s b/llvm/test/MC/AVR/inst-sbci.s
index 3330294f768d8..a45cfe0ccd168 100644
--- a/llvm/test/MC/AVR/inst-sbci.s
+++ b/llvm/test/MC/AVR/inst-sbci.s
@@ -14,7 +14,6 @@ foo:
 ; CHECK: sbci r19, 16                 ; encoding: [0x30,0x41]
 
 ; CHECK: sbci r22, FOO                ; encoding: [0x60'A',0x40]
-; CHECK:                              ;   fixup A - offset: 0, value: FOO, kind: fixup_ldi
 
 ; CHECK-INST: sbci r17, 21
 ; CHECK-INST: sbci r23, 196

diff  --git a/llvm/test/MC/AVR/inst-sbi.s b/llvm/test/MC/AVR/inst-sbi.s
index ef026efdebc6c..85f4832269df7 100644
--- a/llvm/test/MC/AVR/inst-sbi.s
+++ b/llvm/test/MC/AVR/inst-sbi.s
@@ -21,7 +21,6 @@ foo:
 ; CHECK: sbi 31, 7                 ; encoding: [0xff,0x9a]
 
 ; CHECK: sbi main, 0               ; encoding: [0bAAAAA000,0x9a]
-; CHECK:                           ;   fixup A - offset: 0, value: main, kind: fixup_port5
 
 ; CHECK-INST: sbi 3, 5
 ; CHECK-INST: sbi 1, 1

diff  --git a/llvm/test/MC/AVR/inst-sbic.s b/llvm/test/MC/AVR/inst-sbic.s
index 1e8abdb29228d..b0576c9c4029c 100644
--- a/llvm/test/MC/AVR/inst-sbic.s
+++ b/llvm/test/MC/AVR/inst-sbic.s
@@ -21,7 +21,6 @@ foo:
 ; CHECK: sbic 31, 7                  ; encoding: [0xff,0x99]
 
 ; CHECK: sbic foo+1, 1               ; encoding: [0bAAAAA001,0x99]
-; CHECK:                             ;   fixup A - offset: 0, value: foo+1, kind: fixup_port5
 
 ; CHECK-INST: sbic 4,  3
 ; CHECK-INST: sbic 6,  2

diff  --git a/llvm/test/MC/AVR/inst-sbis.s b/llvm/test/MC/AVR/inst-sbis.s
index 96996259ed2e5..5ce26120d2790 100644
--- a/llvm/test/MC/AVR/inst-sbis.s
+++ b/llvm/test/MC/AVR/inst-sbis.s
@@ -21,7 +21,6 @@ foo:
 ; CHECK: sbis 31, 7                  ; encoding: [0xff,0x9b]
 
 ; CHECK: sbis FOO+4, 7               ; encoding: [0bAAAAA111,0x9b]
-; CHECK:                             ;   fixup A - offset: 0, value: FOO+4, kind: fixup_port5
 
 ; CHECK-INST: sbis 4,  3
 ; CHECK-INST: sbis 6,  2

diff  --git a/llvm/test/MC/AVR/inst-sbiw.s b/llvm/test/MC/AVR/inst-sbiw.s
index 640f503c62aea..aaebe71a5af79 100644
--- a/llvm/test/MC/AVR/inst-sbiw.s
+++ b/llvm/test/MC/AVR/inst-sbiw.s
@@ -30,9 +30,7 @@ foo:
 ; CHECK: sbiw r24,  2                  ; encoding: [0x02,0x97]
 
 ; CHECK: sbiw    r24, SYMBOL-1         ; encoding: [0b00AAAAAA,0x97]
-                                       ;   fixup A - offset: 0, value: SYMBOL-1, kind: fixup_6_adiw
 ; CHECK: sbiw    r24, z+15             ; encoding: [0b00AAAAAA,0x97]
-                                       ;   fixup A - offset: 0, value: z+15, kind: fixup_6_adiw
 
 ; CHECK-INST: sbiw r26, 54
 ; CHECK-INST: sbiw r26, 63

diff  --git a/llvm/test/MC/AVR/inst-sbr.s b/llvm/test/MC/AVR/inst-sbr.s
index 9f946e2cc0c86..4e1daa5383f5c 100644
--- a/llvm/test/MC/AVR/inst-sbr.s
+++ b/llvm/test/MC/AVR/inst-sbr.s
@@ -15,7 +15,6 @@ foo:
 ; CHECK: ori r31, 0                    ; encoding: [0xf0,0x60]
 
 ; CHECK: ori     r19, _start           ; encoding: [0x30'A',0x60]
-; CHECK:                               ;   fixup A - offset: 0, value: _start, kind: fixup_ldi
 
 ; CHECK-INST: ori r17, 208
 ; CHECK-INST: ori r24, 190

diff  --git a/llvm/test/MC/AVR/inst-std.s b/llvm/test/MC/AVR/inst-std.s
index ca817fa377224..fdbbeb0b17ce3 100644
--- a/llvm/test/MC/AVR/inst-std.s
+++ b/llvm/test/MC/AVR/inst-std.s
@@ -18,7 +18,6 @@ foo:
 ; CHECK: std Z+30, r7                 ; encoding: [0x76,0x8e]
 
 ; CHECK: std Y+foo, r9                ; encoding: [0x98'A',0x82'A']
-; CHECK:                              ;   fixup A - offset: 0, value: +foo, kind: fixup_6
 
 ; INST: std Y+2, r2
 ; INST: std Y+0, r0

diff  --git a/llvm/test/MC/AVR/inst-sts-tiny.s b/llvm/test/MC/AVR/inst-sts-tiny.s
index a0d67c7177fbe..95051a23242fe 100644
--- a/llvm/test/MC/AVR/inst-sts-tiny.s
+++ b/llvm/test/MC/AVR/inst-sts-tiny.s
@@ -11,11 +11,8 @@ foo:
 ; CHECK:  sts 3,        r16           ; encoding: [0x03,0xa8]
 ; CHECK:  sts 127,      r17           ; encoding: [0x1f,0xaf]
 ; CHECK:  sts SYMBOL+1, r25           ; encoding: [0x90'A',0xa8'A']
-; CHECK:                              ; fixup A - offset: 0, value: SYMBOL+1, kind: fixup_lds_sts_16
 ; CHECK:  sts x,        r25           ; encoding: [0x90'A',0xa8'A']
-; CHECK:                              ; fixup A - offset: 0, value: x, kind: fixup_lds_sts_16
 ; CHECK:  sts r25+1,    r25           ; encoding: [0x90'A',0xa8'A']
-; CHECK:                              ; fixup A - offset: 0, value: r25+1, kind: fixup_lds_sts_16
 
 ; CHECK-INST: sts 3,   r16
 ; CHECK-INST: sts 127, r17

diff  --git a/llvm/test/MC/AVR/inst-sts.s b/llvm/test/MC/AVR/inst-sts.s
index f7bc3e9cd37b0..0b575342baa25 100644
--- a/llvm/test/MC/AVR/inst-sts.s
+++ b/llvm/test/MC/AVR/inst-sts.s
@@ -11,11 +11,8 @@ foo:
 ; CHECK:  sts 3,        r5            ; encoding: [0x50,0x92,0x03,0x00]
 ; CHECK:  sts 255,      r7            ; encoding: [0x70,0x92,0xff,0x00]
 ; CHECK:  sts SYMBOL+1, r25           ; encoding: [0x90,0x93,A,A]
-; CHECK:                              ;   fixup A - offset: 2, value: SYMBOL+1, kind: fixup_16
 ; CHECK:  sts r25,      r25           ; encoding: [0x90,0x93,A,A]
-; CHECK:                              ;   fixup A - offset: 2, value: r25, kind: fixup_16
 ; CHECK:  sts y+3,      r25           ; encoding: [0x90,0x93,A,A]
-; CHECK:                              ;   fixup A - offset: 2, value: y+3, kind: fixup_16
 
 
 ; CHECK-INST: sts 3,   r5

diff  --git a/llvm/test/MC/AVR/inst-subi.s b/llvm/test/MC/AVR/inst-subi.s
index 478d229a3e0c9..08aa1187d8f8e 100644
--- a/llvm/test/MC/AVR/inst-subi.s
+++ b/llvm/test/MC/AVR/inst-subi.s
@@ -15,7 +15,6 @@ foo:
 ; CHECK: subi r16, 144                 ; encoding: [0x00,0x59]
 
 ; CHECK: subi    r20, EXTERN_SYMBOL+0  ; encoding: [0x40'A',0x50]
-; CHECK:                               ;   fixup A - offset: 0, value: EXTERN_SYMBOL+0, kind: fixup_ldi
 
 ; CHECK-INST: subi r22, 82
 ; CHECK-INST: subi r27, 39

diff  --git a/llvm/test/MC/AVR/modifiers.s b/llvm/test/MC/AVR/modifiers.s
index 51b3ad129f732..58275911cd188 100644
--- a/llvm/test/MC/AVR/modifiers.s
+++ b/llvm/test/MC/AVR/modifiers.s
@@ -21,9 +21,7 @@ bar:
     ldi r24, hi8(bar)
 
 ; CHECK: ldi  r24, lo8(bar)         ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: lo8(bar), kind: fixup_lo8_ldi
 ; CHECK: ldi  r24, hi8(bar)         ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: hi8(bar), kind: fixup_hi8_ldi
 
 lo8:
     ldi r24, lo8(0x0815)
@@ -32,9 +30,7 @@ lo8:
 
 ; CHECK: ldi  r24, lo8(2069)        ; encoding: [0x85,0xe1]
 ; CHECK: ldi  r24, lo8(foo)         ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: lo8(foo), kind: fixup_lo8_ldi
 ; CHECK: ldi  r24, lo8(bar+5)       ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: lo8(bar+5), kind: fixup_lo8_ldi
 
 lo8_neg:
     ldi r24, lo8(-(123456))
@@ -42,7 +38,6 @@ lo8_neg:
 
 ; CHECK: ldi  r24, lo8(-(123456))   ; encoding: [0x80,0xec]
 ; CHECK: ldi  r24, lo8(-(foo))      ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: lo8(-(foo)), kind: fixup_lo8_ldi_neg
 
 hi8:
     ldi r24, hi8(0x0815)
@@ -51,9 +46,7 @@ hi8:
 
 ; CHECK: ldi  r24, hi8(2069)        ; encoding: [0x88,0xe0]
 ; CHECK: ldi  r24, hi8(foo)         ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: hi8(foo), kind: fixup_hi8_ldi
 ; CHECK: ldi  r24, hi8(bar+5)       ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: hi8(bar+5), kind: fixup_hi8_ldi
 
 hi8_neg:
     ldi r24, hi8(-(123456))
@@ -61,7 +54,6 @@ hi8_neg:
 
 ; CHECK: ldi  r24, hi8(-(123456))   ; encoding: [0x8d,0xe1]
 ; CHECK: ldi  r24, hi8(-(foo))      ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: hi8(-(foo)), kind: fixup_hi8_ldi_neg
 
 hh8:
     ldi r24, hh8(0x0815)
@@ -70,9 +62,7 @@ hh8:
 
 ; CHECK: ldi  r24, hh8(2069)        ; encoding: [0x80,0xe0]
 ; CHECK: ldi  r24, hh8(foo)         ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: hh8(foo), kind: fixup_hh8_ldi
 ; CHECK: ldi  r24, hh8(bar+5)       ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: hh8(bar+5), kind: fixup_hh8_ldi
 
 hh8_neg:
     ldi r24, hh8(-(123456))
@@ -80,7 +70,6 @@ hh8_neg:
 
 ; CHECK: ldi  r24, hh8(-(123456))     ; encoding: [0x8e,0xef]
 ; CHECK: ldi  r24, hh8(-(foo))        ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: hh8(-(foo)), kind: fixup_hh8_ldi_neg
 
 hlo8: ; synonym with hh8() above, hence the... odd results
     ldi r24, hlo8(0x0815)
@@ -89,9 +78,7 @@ hlo8: ; synonym with hh8() above, hence the... odd results
 
 ; CHECK: ldi  r24, hh8(2069)        ; encoding: [0x80,0xe0]
 ; CHECK: ldi  r24, hh8(foo)         ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: hh8(foo), kind: fixup_hh8_ldi
 ; CHECK: ldi  r24, hh8(bar+5)       ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: hh8(bar+5), kind: fixup_hh8_ldi
 
 hlo8_neg:
     ldi r24, hlo8(-(123456))
@@ -99,7 +86,6 @@ hlo8_neg:
 
 ; CHECK: ldi  r24, hh8(-(123456))  ; encoding: [0x8e,0xef]
 ; CHECK: ldi  r24, hh8(-(foo))     ; encoding: [0x80'A',0xe0]
-; CHECK:                           ; fixup A - offset: 0, value: hh8(-(foo)), kind: fixup_hh8_ldi_neg
 
 hhi8:
     ldi r24, hhi8(0x0815)
@@ -108,9 +94,7 @@ hhi8:
 
 ; CHECK: ldi  r24, hhi8(2069)       ; encoding: [0x80,0xe0]
 ; CHECK: ldi  r24, hhi8(foo)        ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: hhi8(foo), kind: fixup_ms8_ldi
 ; CHECK: ldi  r24, hhi8(bar+5)      ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: hhi8(bar+5), kind: fixup_ms8_ldi
 
 hhi8_neg:
     ldi r24, hhi8(-(123456))
@@ -119,7 +103,6 @@ hhi8_neg:
 
 ; CHECK: ldi  r24, hhi8(-(123456))  ; encoding: [0x8f,0xef]
 ; CHECK: ldi  r24, hhi8(-(foo))     ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: hhi8(-(foo)), kind: fixup_ms8_ldi_neg
 
 pm_lo8:
     ldi r24, pm_lo8(0x0815)
@@ -128,9 +111,7 @@ pm_lo8:
 
 ; CHECK: ldi  r24, pm_lo8(2069)     ; encoding: [0x8a,0xe0]
 ; CHECK: ldi  r24, pm_lo8(foo)      ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: pm_lo8(foo), kind: fixup_lo8_ldi_pm
 ; CHECK: ldi  r24, pm_lo8(bar+5)    ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: pm_lo8(bar+5), kind: fixup_lo8_ldi_pm
 
 pm_hi8:
     ldi r24, pm_hi8(0x0815)
@@ -139,9 +120,7 @@ pm_hi8:
 
 ; CHECK: ldi  r24, pm_hi8(2069)     ; encoding: [0x84,0xe0]
 ; CHECK: ldi  r24, pm_hi8(foo)      ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: pm_hi8(foo), kind: fixup_hi8_ldi_pm
 ; CHECK: ldi  r24, pm_hi8(bar+5)    ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: pm_hi8(bar+5), kind: fixup_hi8_ldi_pm
 
 pm_hh8:
     ldi r24, pm_hh8(0x0815)
@@ -150,9 +129,7 @@ pm_hh8:
 
 ; CHECK: ldi  r24, pm_hh8(2069)     ; encoding: [0x80,0xe0]
 ; CHECK: ldi  r24, pm_hh8(foo)      ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: pm_hh8(foo), kind: fixup_hh8_ldi_pm
 ; CHECK: ldi  r24, pm_hh8(bar+5)    ; encoding: [0x80'A',0xe0]
-; CHECK:                            ; fixup A - offset: 0, value: pm_hh8(bar+5), kind: fixup_hh8_ldi_pm
 
 pm_lo8_neg:
     ldi r24, pm_lo8(-(0x0815))
@@ -161,9 +138,7 @@ pm_lo8_neg:
 
 ; CHECK: ldi  r24, pm_lo8(-(2069))   ; encoding: [0x85,0xef]
 ; CHECK: ldi  r24, pm_lo8(-(foo))    ; encoding: [0x80'A',0xe0]
-; CHECK:                             ; fixup A - offset: 0, value: pm_lo8(-(foo)), kind: fixup_lo8_ldi_pm_neg
 ; CHECK: ldi  r24, pm_lo8(-(bar+5))  ; encoding: [0x80'A',0xe0]
-; CHECK:                             ; fixup A - offset: 0, value: pm_lo8(-(bar+5)), kind: fixup_lo8_ldi_pm_neg
 
 pm_hi8_neg:
     ldi r24, pm_hi8(-(0x0815))
@@ -172,9 +147,7 @@ pm_hi8_neg:
 
 ; CHECK: ldi  r24, pm_hi8(-(2069))   ; encoding: [0x8b,0xef]
 ; CHECK: ldi  r24, pm_hi8(-(foo))    ; encoding: [0x80'A',0xe0]
-; CHECK:                             ; fixup A - offset: 0, value: pm_hi8(-(foo)), kind: fixup_hi8_ldi_pm_neg
 ; CHECK: ldi  r24, pm_hi8(-(bar+5))  ; encoding: [0x80'A',0xe0]
-; CHECK:                             ; fixup A - offset: 0, value: pm_hi8(-(bar+5)), kind: fixup_hi8_ldi_pm_neg
 
 pm_hh8_neg:
     ldi r24, pm_hh8(-(0x0815))
@@ -183,6 +156,4 @@ pm_hh8_neg:
 
 ; CHECK: ldi  r24, pm_hh8(-(2069))   ; encoding: [0x8f,0xef]
 ; CHECK: ldi  r24, pm_hh8(-(foo))    ; encoding: [0x80'A',0xe0]
-; CHECK:                             ; fixup A - offset: 0, value: pm_hh8(-(foo)), kind: fixup_hh8_ldi_pm_neg
 ; CHECK: ldi  r24, pm_hh8(-(bar+5))  ; encoding: [0x80'A',0xe0]
-; CHECK:                             ; fixup A - offset: 0, value: pm_hh8(-(bar+5)), kind: fixup_hh8_ldi_pm_neg

diff  --git a/llvm/test/MC/CSKY/basic-16bit.s b/llvm/test/MC/CSKY/basic-16bit.s
index e341a1d1c31e0..3799cbac43fa8 100644
--- a/llvm/test/MC/CSKY/basic-16bit.s
+++ b/llvm/test/MC/CSKY/basic-16bit.s
@@ -202,19 +202,16 @@ tstnbz16 a3
 
 # CHECK-ASM: br16 .L.test
 # CHECK-ASM: encoding: [A,0x04'A']
-# CHECK-ASM: fixup A - offset: 0, value: .L.test, kind: fixup_csky_pcrel_imm10_scale2
 .L.test:
 br16 .L.test
 
 # CHECK-ASM: bt16 .L.test2
 # CHECK-ASM: encoding: [A,0x08'A']
-# CHECK-ASM: fixup A - offset: 0, value: .L.test2, kind: fixup_csky_pcrel_imm10_scale2
 .L.test2:
 bt16 .L.test2
 
 # CHECK-ASM: bf16 .L.test3
 # CHECK-ASM: encoding: [A,0x0c'A']
-# CHECK-ASM: fixup A - offset: 0, value: .L.test3, kind: fixup_csky_pcrel_imm10_scale2
 .L.test3:
 bf16 .L.test3
 
@@ -228,7 +225,6 @@ jsr16 a3
 
 # CHECK-ASM: lrw16 a0, [.L.test14]
 # CHECK-ASM: encoding: [A,A]
-# CHECK-ASM: fixup A - offset: 0, value: .L.test14, kind: fixup_csky_pcrel_uimm7_scale4
 .L.test14:
 lrw16 a0, [.L.test14]
 

diff  --git a/llvm/test/MC/CSKY/basic.s b/llvm/test/MC/CSKY/basic.s
index 3a8d3868f2957..fd4bb667a0058 100644
--- a/llvm/test/MC/CSKY/basic.s
+++ b/llvm/test/MC/CSKY/basic.s
@@ -476,55 +476,46 @@ doze32
 
 # CHECK-ASM: br32 .L.test
 # CHECK-ASM: encoding: [A,0xe8'A',A,A]
-# CHECK-ASM: fixup A - offset: 0, value: .L.test, kind: fixup_csky_pcrel_imm16_scale2
 .L.test:
 br32 .L.test
 
 # CHECK-ASM: bt32 .L.test2
 # CHECK-ASM: encoding: [0x60'A',0xe8'A',A,A]
-# CHECK-ASM: fixup A - offset: 0, value: .L.test2, kind: fixup_csky_pcrel_imm16_scale2
 .L.test2:
 bt32 .L.test2
 
 # CHECK-ASM: bf32 .L.test3
 # CHECK-ASM: encoding: [0x40'A',0xe8'A',A,A]
-# CHECK-ASM: fixup A - offset: 0, value: .L.test3, kind: fixup_csky_pcrel_imm16_scale2
 .L.test3:
 bf32 .L.test3
 
 # CHECK-ASM: bez32 a0, .L.test4
 # CHECK-ASM: encoding: [A,0xe9'A',A,A]
-# CHECK-ASM: fixup A - offset: 0, value: .L.test4, kind: fixup_csky_pcrel_imm16_scale2
 .L.test4:
 bez32 a0, .L.test4
 
 # CHECK-ASM: bnez32 a0, .L.test5
 # CHECK-ASM: encoding: [0x20'A',0xe9'A',A,A]
-# CHECK-ASM: fixup A - offset: 0, value: .L.test5, kind: fixup_csky_pcrel_imm16_scale2
 .L.test5:
 bnez32 a0, .L.test5
 
 # CHECK-ASM: bhz32 a0, .L.test6
 # CHECK-ASM: encoding: [0x40'A',0xe9'A',A,A]
-# CHECK-ASM: fixup A - offset: 0, value: .L.test6, kind: fixup_csky_pcrel_imm16_scale2
 .L.test6:
 bhz32 a0, .L.test6
 
 # CHECK-ASM: blsz32 a0, .L.test7
 # CHECK-ASM: encoding: [0x60'A',0xe9'A',A,A]
-# CHECK-ASM: fixup A - offset: 0, value: .L.test7, kind: fixup_csky_pcrel_imm16_scale2
 .L.test7:
 blsz32 a0, .L.test7
 
 # CHECK-ASM: blz32 a0, .L.test8
 # CHECK-ASM: encoding: [0x80'A',0xe9'A',A,A]
-# CHECK-ASM: fixup A - offset: 0, value: .L.test8, kind: fixup_csky_pcrel_imm16_scale2
 .L.test8:
 blz32 a0, .L.test8
 
 # CHECK-ASM: bhsz32 a0, .L.test9
 # CHECK-ASM: encoding: [0xa0'A',0xe9'A',A,A]
-# CHECK-ASM: fixup A - offset: 0, value: .L.test9, kind: fixup_csky_pcrel_imm16_scale2
 .L.test9:
 bhsz32 a0, .L.test9
 
@@ -534,13 +525,11 @@ jmp32 a3
 
 # CHECK-ASM: jmpi32 [.L.test10]
 # CHECK-ASM: encoding: [0xc0'A',0xea'A',A,A]
-# CHECK-ASM: fixup A - offset: 0, value: .L.test10, kind: fixup_csky_pcrel_uimm16_scale4
 .L.test10:
 jmpi32 [.L.test10]
 
 # CHECK-ASM: bsr32 .L.test11
 # CHECK-ASM: encoding: [A,0xe0'A',A,A]
-# CHECK-ASM: fixup A - offset: 0, value: .L.test11, kind: fixup_csky_pcrel_imm26_scale2
 .L.test11:
 bsr32 .L.test11
 
@@ -550,19 +539,16 @@ jsr32 a3
 
 # CHECK-ASM: jsri32 [.L.test12]
 # CHECK-ASM: encoding: [0xe0'A',0xea'A',A,A]
-# CHECK-ASM: fixup A - offset: 0, value: .L.test12, kind: fixup_csky_pcrel_uimm16_scale4
 .L.test12:
 jsri32 [.L.test12]
 
 # CHECK-ASM: grs32 a0, .L.test13
 # CHECK-ASM: encoding: [0x0c'A',0xcc'A',A,A]
-# CHECK-ASM: fixup A - offset: 0, value: .L.test13, kind: fixup_csky_pcrel_imm18_scale2
 .L.test13:
 grs32 a0, .L.test13
 
 # CHECK-ASM: lrw32 a0, [.L.test14]
 # CHECK-ASM: encoding: [0x80'A',0xea'A',A,A]
-# CHECK-ASM: fixup A - offset: 0, value: .L.test14, kind: fixup_csky_pcrel_uimm16_scale4
 .L.test14:
 lrw32 a0, [.L.test14]
 

diff  --git a/llvm/test/MC/Sparc/sparc-assembly-exprs.s b/llvm/test/MC/Sparc/sparc-assembly-exprs.s
index e950f1635ab3a..e2b877ac93e5b 100644
--- a/llvm/test/MC/Sparc/sparc-assembly-exprs.s
+++ b/llvm/test/MC/Sparc/sparc-assembly-exprs.s
@@ -7,33 +7,27 @@
         mov      ((12+3)<<2), %o2
 
         ! CHECK:   ba      symStart+4           ! encoding: [0x10,0b10AAAAAA,A,A]
-        ! CHECK:   fixup A - offset: 0, value: symStart+4, kind: fixup_sparc_br22
         ! OBJDUMP: ba    1
 symStart:
         b        symStart + 4
 
         ! CHECK:   mov     symEnd-symStart, %g1 ! encoding: [0x82,0x10,0b001AAAAA,A]
-        ! CHECK:   fixup A - offset: 0, value: symEnd-symStart, kind: fixup_sparc_13
         ! OBJDUMP: mov	   24, %g1
         mov      symEnd - symStart, %g1
 
         ! CHECK:   sethi %hi(sym+10), %g2       ! encoding: [0x05,0b00AAAAAA,A,A]
-        ! CHECK:   fixup A - offset: 0, value: %hi(sym+10), kind: fixup_sparc_hi22
         ! OBJDUMP: R_SPARC_HI22	sym+0xa
         sethi    %hi(sym + 10), %g2
 
         ! CHECK:   call foo+40                  ! encoding: [0b01AAAAAA,A,A,A]
-        ! CHECK:   fixup A - offset: 0, value: foo+40, kind: fixup_sparc_call30
         ! OBJDUMP: R_SPARC_WDISP30 foo+0x28
         call     foo + 40
 
         ! CHECK:   add %g1, val+100, %g1        ! encoding: [0x82,0x00,0b011AAAAA,A]
-        ! CHECK:   fixup A - offset: 0, value: val+100, kind: fixup_sparc_13
         ! OBJDUMP: R_SPARC_13 val+0x64
         add      %g1, val + 100, %g1
 
         ! CHECK:   add %g1, 100+val, %g2        ! encoding: [0x84,0x00,0b011AAAAA,A]
-        ! CHECK:   fixup A - offset: 0, value: 100+val, kind: fixup_sparc_13
         ! OBJDUMP: R_SPARC_13	val+0x64
         add      %g1, 100 + val, %g2
 symEnd:

diff  --git a/llvm/test/MC/Sparc/sparc-ctrl-instructions.s b/llvm/test/MC/Sparc/sparc-ctrl-instructions.s
index 05a691de4f966..9cb83ecf4456d 100644
--- a/llvm/test/MC/Sparc/sparc-ctrl-instructions.s
+++ b/llvm/test/MC/Sparc/sparc-ctrl-instructions.s
@@ -2,11 +2,9 @@
 ! RUN: llvm-mc %s -triple=sparcv9 -show-encoding | FileCheck %s
 
         ! CHECK: call foo     ! encoding: [0b01AAAAAA,A,A,A]
-        ! CHECK:              !   fixup A - offset: 0, value: foo, kind: fixup_sparc_call30
         call foo
 
         ! CHECK: call foo, 0  ! encoding: [0b01AAAAAA,A,A,A]
-        ! CHECK:              !   fixup A - offset: 0, value: foo, kind: fixup_sparc_call30
         call foo, 0
 
         ! CHECK: call %g1+%i2 ! encoding: [0x9f,0xc0,0x40,0x1a]
@@ -28,11 +26,9 @@
         call %g1, 3
 
         ! CHECK: call %g1+%lo(sym)   ! encoding: [0x9f,0xc0,0b011000AA,A]
-        ! CHECK-NEXT:                ! fixup A - offset: 0, value: %lo(sym), kind: fixup_sparc_lo10
         call %g1+%lo(sym)
 
         ! CHECK: call %g1+%lo(sym), 4   ! encoding: [0x9f,0xc0,0b011000AA,A]
-        ! CHECK-NEXT:                ! fixup A - offset: 0, value: %lo(sym), kind: fixup_sparc_lo10
         call %g1+%lo(sym), 4
 
         ! CHECK-LABEL: .Ltmp0:
@@ -53,7 +49,6 @@
         jmp %g1
 
         ! CHECK: jmp %g1+%lo(sym)   ! encoding: [0x81,0xc0,0b011000AA,A]
-        ! CHECK-NEXT:                ! fixup A - offset: 0, value: %lo(sym), kind: fixup_sparc_lo10
         jmp %g1+%lo(sym)
 
         ! CHECK: jmp sym ! encoding: [0x81,0xc0,0b001AAAAA,A]
@@ -69,469 +64,353 @@
         jmpl %g1, %g2
 
         ! CHECK: jmpl %g1+%lo(sym), %g2   ! encoding: [0x85,0xc0,0b011000AA,A]
-        ! CHECK-NEXT:                     ! fixup A - offset: 0, value: %lo(sym), kind: fixup_sparc_lo10
         jmpl %g1+%lo(sym), %g2
 
         ! CHECK: ba .BB0      ! encoding: [0x10,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         ba .BB0
 
         ! CHECK: bne .BB0     ! encoding: [0x12,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bne .BB0
 
         ! CHECK: bne .BB0     ! encoding: [0x12,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bnz .BB0
 
         ! CHECK: be .BB0      ! encoding: [0x02,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         be .BB0
 
         ! CHECK: be .BB0      ! encoding: [0x02,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bz .BB0
 
         ! CHECK: be .BB0      ! encoding: [0x02,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         beq .BB0
 
         ! CHECK: bg .BB0      ! encoding: [0x14,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bg .BB0
 
         ! CHECK: bg .BB0      ! encoding: [0x14,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bgt .BB0
 
         ! CHECK: ble .BB0      ! encoding: [0x04,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         ble .BB0
 
         ! CHECK: bge .BB0      ! encoding: [0x16,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bge .BB0
 
         ! CHECK: bl .BB0      ! encoding: [0x06,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bl .BB0
 
         ! CHECK: bl .BB0      ! encoding: [0x06,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         blt .BB0
 
         ! CHECK: bgu .BB0      ! encoding: [0x18,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bgu .BB0
 
         ! CHECK: bleu .BB0      ! encoding: [0x08,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bleu .BB0
 
         ! CHECK: bcc .BB0      ! encoding: [0x1a,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bcc .BB0
 
         ! CHECK: bcc .BB0      ! encoding: [0x1a,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bgeu .BB0
 
         ! CHECK: bcs .BB0      ! encoding: [0x0a,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bcs .BB0
 
         ! CHECK: bcs .BB0      ! encoding: [0x0a,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         blu .BB0
 
         ! CHECK: bpos .BB0      ! encoding: [0x1c,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bpos .BB0
 
         ! CHECK: bneg .BB0      ! encoding: [0x0c,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bneg .BB0
 
         ! CHECK: bvc .BB0      ! encoding: [0x1e,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bvc .BB0
 
         ! CHECK: bvs .BB0      ! encoding: [0x0e,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bvs .BB0
 
         ! CHECK:             fba .BB0                        ! encoding: [0x11,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fba .BB0
 
         ! CHECK:             fba .BB0                        ! encoding: [0x11,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fb .BB0
 
         ! CHECK:             fbn .BB0                        ! encoding: [0x01,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbn .BB0
 
         ! CHECK:             fbu .BB0                        ! encoding: [0x0f,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbu .BB0
 
         ! CHECK:             fbg .BB0                        ! encoding: [0x0d,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbg .BB0
 
         ! CHECK:             fbug .BB0                       ! encoding: [0x0b,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbug .BB0
 
         ! CHECK:             fbl .BB0                        ! encoding: [0x09,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbl .BB0
 
         ! CHECK:             fbul .BB0                       ! encoding: [0x07,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbul .BB0
 
         ! CHECK:             fblg .BB0                       ! encoding: [0x05,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fblg .BB0
 
         ! CHECK:             fbne .BB0                       ! encoding: [0x03,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbne .BB0
 
         ! CHECK:             fbne .BB0                       ! encoding: [0x03,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbnz .BB0
 
         ! CHECK:             fbe .BB0                        ! encoding: [0x13,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbe .BB0
 
         ! CHECK:             fbe .BB0                        ! encoding: [0x13,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbz .BB0
 
         ! CHECK:             fbue .BB0                       ! encoding: [0x15,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbue .BB0
 
         ! CHECK:             fbge .BB0                       ! encoding: [0x17,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbge .BB0
 
         ! CHECK:             fbuge .BB0                      ! encoding: [0x19,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbuge .BB0
 
         ! CHECK:             fble .BB0                       ! encoding: [0x1b,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fble .BB0
 
         ! CHECK:             fbule .BB0                      ! encoding: [0x1d,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbule .BB0
 
         ! CHECK:             fbo .BB0                        ! encoding: [0x1f,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbo .BB0
         
         ! CHECK:             cba .BB0                        ! encoding: [0x11,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb .BB0
 
         ! CHECK:             cba .BB0                        ! encoding: [0x11,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cba .BB0
 
         ! CHECK:             cbn .BB0                        ! encoding: [0x01,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cbn .BB0
 
         ! CHECK:             cb3 .BB0                        ! encoding: [0x0f,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb3 .BB0
 
         ! CHECK:             cb2 .BB0                        ! encoding: [0x0d,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb2 .BB0
 
         ! CHECK:             cb23 .BB0                       ! encoding: [0x0b,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb23 .BB0
 
         ! CHECK:             cb1 .BB0                        ! encoding: [0x09,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb1 .BB0
 
         ! CHECK:             cb13 .BB0                       ! encoding: [0x07,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb13 .BB0
 
         ! CHECK:             cb12 .BB0                       ! encoding: [0x05,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb12 .BB0
 
         ! CHECK:             cb123 .BB0                      ! encoding: [0x03,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb123 .BB0
 
         ! CHECK:             cb0 .BB0                        ! encoding: [0x13,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb0 .BB0
 
         ! CHECK:             cb03 .BB0                       ! encoding: [0x15,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb03 .BB0
 
         ! CHECK:             cb02 .BB0                       ! encoding: [0x17,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb02 .BB0
 
         ! CHECK:             cb023 .BB0                      ! encoding: [0x19,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb023 .BB0
 
         ! CHECK:             cb01 .BB0                       ! encoding: [0x1b,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb01 .BB0
 
         ! CHECK:             cb013 .BB0                      ! encoding: [0x1d,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb013 .BB0
 
         ! CHECK:             cb012 .BB0                      ! encoding: [0x1f,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb012 .BB0
 
         ! CHECK: ba,a .BB0    ! encoding: [0x30,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         ba,a .BB0
 
         ! CHECK: bne,a .BB0   ! encoding: [0x32,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bne,a .BB0
 
         ! CHECK: be,a .BB0    ! encoding: [0x22,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         be,a .BB0
 
         ! CHECK: bg,a .BB0    ! encoding: [0x34,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bg,a .BB0
 
         ! CHECK: ble,a .BB0   ! encoding: [0x24,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         ble,a .BB0
 
         ! CHECK: bge,a .BB0   ! encoding: [0x36,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bge,a .BB0
 
         ! CHECK: bl,a .BB0    ! encoding: [0x26,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bl,a .BB0
 
         ! CHECK: bgu,a .BB0   ! encoding: [0x38,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bgu,a .BB0
 
         ! CHECK: bleu,a .BB0  ! encoding: [0x28,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bleu,a .BB0
 
         ! CHECK: bcc,a .BB0   ! encoding: [0x3a,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bcc,a .BB0
 
         ! CHECK: bcs,a .BB0   ! encoding: [0x2a,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bcs,a .BB0
 
         ! CHECK: bpos,a .BB0  ! encoding: [0x3c,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bpos,a .BB0
 
         ! CHECK: bneg,a .BB0  ! encoding: [0x2c,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bneg,a .BB0
 
         ! CHECK: bvc,a .BB0   ! encoding: [0x3e,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bvc,a .BB0
 
         ! CHECK: bvs,a .BB0   ! encoding: [0x2e,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         bvs,a .BB0
 
         ! CHECK:             fbu,a .BB0                      ! encoding: [0x2f,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbu,a .BB0
 
         ! CHECK:             fbg,a .BB0                      ! encoding: [0x2d,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbg,a .BB0
         ! CHECK:             fbug,a .BB0                     ! encoding: [0x2b,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbug,a .BB0
 
         ! CHECK:             fbl,a .BB0                      ! encoding: [0x29,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbl,a .BB0
 
         ! CHECK:             fbul,a .BB0                     ! encoding: [0x27,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbul,a .BB0
 
         ! CHECK:             fblg,a .BB0                     ! encoding: [0x25,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fblg,a .BB0
 
         ! CHECK:             fbne,a .BB0                     ! encoding: [0x23,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbne,a .BB0
 
         ! CHECK:             fbe,a .BB0                      ! encoding: [0x33,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbe,a .BB0
 
         ! CHECK:             fbue,a .BB0                     ! encoding: [0x35,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbue,a .BB0
 
         ! CHECK:             fbge,a .BB0                     ! encoding: [0x37,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbge,a .BB0
 
         ! CHECK:             fbuge,a .BB0                    ! encoding: [0x39,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbuge,a .BB0
 
         ! CHECK:             fble,a .BB0                     ! encoding: [0x3b,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fble,a .BB0
 
         ! CHECK:             fbule,a .BB0                    ! encoding: [0x3d,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbule,a .BB0
 
         ! CHECK:             fbo,a .BB0                      ! encoding: [0x3f,0b10AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         fbo,a .BB0
 
         ! CHECK:  rett %i7+8   ! encoding: [0x81,0xcf,0xe0,0x08]
         rett %i7 + 8
 
         ! CHECK:             cb3,a .BB0                      ! encoding: [0x2f,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb3,a .BB0
 
         ! CHECK:             cb2,a .BB0                      ! encoding: [0x2d,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb2,a .BB0
 
         ! CHECK:             cb23,a .BB0                     ! encoding: [0x2b,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb23,a .BB0
 
         ! CHECK:             cb1,a .BB0                      ! encoding: [0x29,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb1,a .BB0
 
         ! CHECK:             cb13,a .BB0                     ! encoding: [0x27,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb13,a .BB0
 
         ! CHECK:             cb12,a .BB0                     ! encoding: [0x25,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb12,a .BB0
 
         ! CHECK:             cb123,a .BB0                    ! encoding: [0x23,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb123,a .BB0
 
         ! CHECK:             cb0,a .BB0                      ! encoding: [0x33,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb0,a .BB0
 
         ! CHECK:             cb03,a .BB0                     ! encoding: [0x35,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb03,a .BB0
 
         ! CHECK:             cb02,a .BB0                     ! encoding: [0x37,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb02,a .BB0
 
         ! CHECK:             cb023,a .BB0                    ! encoding: [0x39,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb023,a .BB0
 
         ! CHECK:             cb01,a .BB0                     ! encoding: [0x3b,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb01,a .BB0
 
         ! CHECK:             cb013,a .BB0                    ! encoding: [0x3d,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb013,a .BB0
 
         ! CHECK:             cb012,a .BB0                    ! encoding: [0x3f,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb012,a .BB0
 
         ! CHECK:             cb3,a .BB0                      ! encoding: [0x2f,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb3,a .BB0
 
         ! CHECK:             cb2,a .BB0                      ! encoding: [0x2d,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb2,a .BB0
 
         ! CHECK:             cb23,a .BB0                     ! encoding: [0x2b,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb23,a .BB0
 
         ! CHECK:             cb1,a .BB0                      ! encoding: [0x29,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb1,a .BB0
 
         ! CHECK:             cb13,a .BB0                     ! encoding: [0x27,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb13,a .BB0
 
         ! CHECK:             cb12,a .BB0                     ! encoding: [0x25,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb12,a .BB0
 
         ! CHECK:             cb123,a .BB0                    ! encoding: [0x23,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb123,a .BB0
 
         ! CHECK:             cb0,a .BB0                      ! encoding: [0x33,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb0,a .BB0
 
         ! CHECK:             cb03,a .BB0                     ! encoding: [0x35,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb03,a .BB0
 
         ! CHECK:             cb02,a .BB0                     ! encoding: [0x37,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb02,a .BB0
 
         ! CHECK:             cb023,a .BB0                    ! encoding: [0x39,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb023,a .BB0
 
         ! CHECK:             cb01,a .BB0                     ! encoding: [0x3b,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb01,a .BB0
 
         ! CHECK:             cb013,a .BB0                    ! encoding: [0x3d,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb013,a .BB0
 
         ! CHECK:             cb012,a .BB0                    ! encoding: [0x3f,0b11AAAAAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         cb012,a .BB0
 
         ! CHECK:  rett %i7+8                                 ! encoding: [0x81,0xcf,0xe0,0x08]

diff  --git a/llvm/test/MC/Sparc/sparc-little-endian.s b/llvm/test/MC/Sparc/sparc-little-endian.s
index e9a56eb7b964d..b0f650bfef9e7 100644
--- a/llvm/test/MC/Sparc/sparc-little-endian.s
+++ b/llvm/test/MC/Sparc/sparc-little-endian.s
@@ -13,6 +13,5 @@
         ! ...and that fixups are applied to the correct bytes.
 
         ! CHECK: ba .BB0      ! encoding: [A,A,0b10AAAAAA,0x10]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
         ! CHECK-OBJ: 4: ff ff bf 10  ba 4194303
         ba .BB0

diff  --git a/llvm/test/MC/Sparc/sparc-relocations.s b/llvm/test/MC/Sparc/sparc-relocations.s
index 82314e440acf6..027164d77b256 100644
--- a/llvm/test/MC/Sparc/sparc-relocations.s
+++ b/llvm/test/MC/Sparc/sparc-relocations.s
@@ -24,75 +24,57 @@
         ! CHECK-OBJ-NEXT: }
 
         ! CHECK: call foo     ! encoding: [0b01AAAAAA,A,A,A]
-        ! CHECK:              !   fixup A - offset: 0, value: foo, kind: fixup_sparc_call30
         call foo
 
         ! CHECK: or %g1, %lo(sym), %g3 ! encoding: [0x86,0x10,0b011000AA,A]
-        ! CHECK-NEXT:                  !   fixup A - offset: 0, value: %lo(sym), kind: fixup_sparc_lo10
         or %g1, %lo(sym), %g3
 
         ! CHECK: sethi %hi(sym), %l0  ! encoding: [0x21,0b00AAAAAA,A,A]
-        ! CHECK-NEXT:                 !   fixup A - offset: 0, value: %hi(sym), kind: fixup_sparc_hi22
         sethi %hi(sym), %l0
 
         ! CHECK: sethi %h44(sym), %l0  ! encoding: [0x21,0b00AAAAAA,A,A]
-        ! CHECK-NEXT:                  !   fixup A - offset: 0, value: %h44(sym), kind: fixup_sparc_h44
         sethi %h44(sym), %l0
 
         ! CHECK: or %g1, %m44(sym), %g3 ! encoding: [0x86,0x10,0b011000AA,A]
-        ! CHECK-NEXT:                   !   fixup A - offset: 0, value: %m44(sym), kind: fixup_sparc_m44
         or %g1, %m44(sym), %g3
 
         ! CHECK: or %g1, %l44(sym), %g3 ! encoding: [0x86,0x10,0b0110AAAA,A]
-        ! CHECK-NEXT:                   !   fixup A - offset: 0, value: %l44(sym), kind: fixup_sparc_l44
         or %g1, %l44(sym), %g3
 
         ! CHECK: sethi %hh(sym), %l0  ! encoding: [0x21,0b00AAAAAA,A,A]
-        ! CHECK-NEXT:                 !   fixup A - offset: 0, value: %hh(sym), kind: fixup_sparc_hh
         sethi %hh(sym), %l0
 
         ! CHECK: sethi %hh(sym), %l0  ! encoding: [0x21,0b00AAAAAA,A,A]
-        ! CHECK-NEXT:                 !   fixup A - offset: 0, value: %hh(sym), kind: fixup_sparc_hh
         sethi %uhi(sym), %l0
 
         ! CHECK: or %g1, %hm(sym), %g3 ! encoding: [0x86,0x10,0b011000AA,A]
-        ! CHECK-NEXT:                  !   fixup A - offset: 0, value: %hm(sym), kind: fixup_sparc_hm
         or %g1, %hm(sym), %g3
 
         ! CHECK: or %g1, %hm(sym), %g3 ! encoding: [0x86,0x10,0b011000AA,A]
-        ! CHECK-NEXT:                  !   fixup A - offset: 0, value: %hm(sym), kind: fixup_sparc_hm
         or %g1, %ulo(sym), %g3
 
         ! CHECK: sethi %lm(sym), %l0  ! encoding: [0x21,0b00AAAAAA,A,A]
-        ! CHECK-NEXT:                 !   fixup A - offset: 0, value: %lm(sym), kind: fixup_sparc_lm
         sethi %lm(sym), %l0
 
         ! CHECK: or %g1, sym, %g3 ! encoding: [0x86,0x10,0b011AAAAA,A]
-        ! CHECK-NEXT:                  !   fixup A - offset: 0, value: sym, kind: fixup_sparc_13
         or %g1, sym, %g3
 
         ! CHECK: or %g1, sym+4, %g3 ! encoding: [0x86,0x10,0b011AAAAA,A]
-        ! CHECK-NEXT:                  ! fixup A - offset: 0, value: sym+4, kind: fixup_sparc_13
         or %g1, (sym+4), %g3
 
         ! CHECK: sethi %hix(sym), %g1 ! encoding: [0x03,0b00AAAAAA,A,A]
-        ! CHECK-NEXT:                 ! fixup A - offset: 0, value: %hix(sym), kind: fixup_sparc_hix22
         sethi %hix(sym), %g1
 
         ! CHECK: xor %g1, %lox(sym), %g1 ! encoding: [0x82,0x18,0b011AAAAA,A]
-        ! CHECK-NEXT:                    ! fixup A - offset: 0, value: %lox(sym), kind: fixup_sparc_lox10
         xor %g1, %lox(sym), %g1
 
         ! CHECK: sethi %gdop_hix22(sym), %l1 ! encoding: [0x23,0x00,0x00,0x00]
-        ! CHECK-NEXT:                        ! fixup A - offset: 0, value: %gdop_hix22(sym), kind: fixup_sparc_gotdata_hix22
         sethi %gdop_hix22(sym), %l1
 
         ! CHECK: or %l1, %gdop_lox10(sym), %l1 ! encoding: [0xa2,0x14,0x60,0x00]
-        ! CHECK-NEXT:                          ! fixup A - offset: 0, value: %gdop_lox10(sym), kind: fixup_sparc_gotdata_lox10
         or %l1, %gdop_lox10(sym), %l1
 
         ! CHECK: ldx [%l7+%l1], %l2, %gdop(sym) ! encoding: [0xe4,0x5d,0xc0,0x11]
-        ! CHECK-NEXT:                           ! fixup A - offset: 0, value: %gdop(sym), kind: fixup_sparc_gotdata_op
         ldx [%l7 + %l1], %l2, %gdop(sym)
 
         ! This test needs to placed last in the file

diff  --git a/llvm/test/MC/Sparc/sparc-synthetic-instructions.s b/llvm/test/MC/Sparc/sparc-synthetic-instructions.s
index 5652f86841950..c5fa6030abb72 100644
--- a/llvm/test/MC/Sparc/sparc-synthetic-instructions.s
+++ b/llvm/test/MC/Sparc/sparc-synthetic-instructions.s
@@ -23,35 +23,27 @@
         save
 
         ! CHECK: sethi %hi(40000), %g1            ! encoding: [0x03,0b00AAAAAA,A,A]
-        ! CHECK:                                  !   fixup A - offset: 0, value: %hi(40000), kind: fixup_sparc_hi22
         ! CHECK: or %g1, %lo(40000), %g1          ! encoding: [0x82,0x10,0b011000AA,A]
-        ! CHECK:                                  !   fixup A - offset: 0, value: %lo(40000), kind: fixup_sparc_lo10
         set 40000, %g1
         ! CHECK: mov 1, %g1 ! encoding: [0x82,0x10,0x20,0x01]
         set 1, %g1
         ! CHECK: sethi %hi(32768), %g1            ! encoding: [0x03,0b00AAAAAA,A,A]
-        ! CHECK:                                  !   fixup A - offset: 0, value: %hi(32768), kind: fixup_sparc_hi22
         set 32768, %g1
 
         ! Expect a 'sethi' without an 'or'.
         ! CHECK: sethi %hi(268431360), %o1       ! encoding: [0x13,0b00AAAAAA,A,A]
-        ! CHECK:                                 !   fixup A - offset: 0, value: %hi(268431360), kind: fixup_sparc_hi22
         set 0x0ffff000, %o1
 
         ! CHECK: sethi %hi(268433408), %o1       ! encoding: [0x13,0b00AAAAAA,A,A]
-        ! CHECK:                                 !   fixup A - offset: 0, value: %hi(268433408), kind: fixup_sparc_hi22
         set 0x0ffff800, %o1
 
         ! This is the boundary case that uses the lowest of the 22 bits in sethi.
         ! CHECK: sethi %hi(268434432), %o1       ! encoding: [0x13,0b00AAAAAA,A,A]
-        ! CHECK:                                 !   fixup A - offset: 0, value: %hi(268434432), kind: fixup_sparc_hi22
         set 0x0ffffc00, %o1
 
         ! Now the synthetic instruction becomes two instructions.
         ! CHECK: sethi %hi(2147483647), %o1      ! encoding: [0x13,0b00AAAAAA,A,A]
-        ! CHECK:                                 !   fixup A - offset: 0, value: %hi(2147483647), kind: fixup_sparc_hi22
         ! CHECK: or %o1, %lo(2147483647), %o1    ! encoding: [0x92,0x12,0b011000AA,A]
-        ! CHECK:                                 !   fixup A - offset: 0, value: %lo(2147483647), kind: fixup_sparc_lo10
         set 2147483647, %o1
 
         ! CHECK: xnor %g1, %g0, %g2               ! encoding: [0x84,0x38,0x40,0x00]
@@ -174,42 +166,31 @@
 
         ! V8: mov        -1, %o1              ! encoding: [0x92,0x10,0x3f,0xff]
         ! V9: sethi %hi(-1), %o1              ! encoding: [0x13,0b00AAAAAA,A,A]
-        ! V9:                                 !   fixup A - offset: 0, value: %hi(-1), kind: fixup_sparc_hi22
         ! V9: or %o1, %lo(-1), %o1            ! encoding: [0x92,0x12,0b011000AA,A]
-        ! V9:                                 !   fixup A - offset: 0, value: %lo(-1), kind: fixup_sparc_lo10
         set 0xffffffff, %o1
 
         ! V8: mov        -2, %o1              ! encoding: [0x92,0x10,0x3f,0xfe]
         ! V9: sethi %hi(-2), %o1              ! encoding: [0x13,0b00AAAAAA,A,A]
-        ! V9:                                 !   fixup A - offset: 0, value: %hi(-2), kind: fixup_sparc_hi22
         ! V9: or %o1, %lo(-2), %o1            ! encoding: [0x92,0x12,0b011000AA,A]
-        ! V9:                                 !   fixup A - offset: 0, value: %lo(-2), kind: fixup_sparc_lo10
         set 0xfffffffe, %o1
 
         ! V8: mov        -16, %o1             ! encoding: [0x92,0x10,0x3f,0xf0]
         ! V9: sethi %hi(-16), %o1             ! encoding: [0x13,0b00AAAAAA,A,A]
-        ! V9:                                 !   fixup A - offset: 0, value: %hi(-16), kind: fixup_sparc_hi22
         ! V9: or %o1, %lo(-16), %o1           ! encoding: [0x92,0x12,0b011000AA,A]
-        ! V9:                                 !   fixup A - offset: 0, value: %lo(-16), kind: fixup_sparc_lo10
         set 0xfffffff0, %o1
 
         ! V8: mov        -256, %o1            ! encoding: [0x92,0x10,0x3f,0x00]
         ! V9: sethi %hi(-256), %o1            ! encoding: [0x13,0b00AAAAAA,A,A]
-        ! V9:                                 !   fixup A - offset: 0, value: %hi(-256), kind: fixup_sparc_hi22
         ! V9: or %o1, %lo(-256), %o1          ! encoding: [0x92,0x12,0b011000AA,A]
-        ! V9:                                 !   fixup A - offset: 0, value: %lo(-256), kind: fixup_sparc_lo10
         set 0xffffff00, %o1
 
         ! V8: mov        -4096, %o1           ! encoding: [0x92,0x10,0x30,0x00]
         ! V9: sethi %hi(-4096), %o1           ! encoding: [0x13,0b00AAAAAA,A,A]
-        ! V9:                                 !   fixup A - offset: 0, value: %hi(-4096), kind: fixup_sparc_hi22
         set 0xfffff000, %o1
 
         ! These results are the same for V8 and V9, so this test could have
         ! been with the others that weren't segregated by architecture,
         ! but logically it belongs here as a boundary case.
         ! V8: sethi %hi(-8192), %o1           ! encoding: [0x13,0b00AAAAAA,A,A]
-        ! V8:                                 !   fixup A - offset: 0, value: %hi(-8192), kind: fixup_sparc_hi22
         ! V9: sethi %hi(-8192), %o1           ! encoding: [0x13,0b00AAAAAA,A,A]
-        ! V9:                                 !   fixup A - offset: 0, value: %hi(-8192), kind: fixup_sparc_hi22
         set 0xffffe000, %o1

diff  --git a/llvm/test/MC/Sparc/sparc-tls-relocations.s b/llvm/test/MC/Sparc/sparc-tls-relocations.s
index 85fe96006a152..8dc6e62baef5e 100644
--- a/llvm/test/MC/Sparc/sparc-tls-relocations.s
+++ b/llvm/test/MC/Sparc/sparc-tls-relocations.s
@@ -31,13 +31,11 @@ foo:
 ! OBJDUMP: {{[0-9,a-f]+}}:  31 00 00 00  sethi 0, %i0
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_LE_HIX22 Local
 ! ASM: sethi %tle_hix22(Local), %i0 ! encoding: [0x31,0x00,0x00,0x00]
-! ASM:                             !   fixup A - offset: 0, value: %tle_hix22(Local), kind: fixup_sparc_tls_le_hix22
         sethi %tle_hix22(Local), %i0
 
 ! OBJDUMP: {{[0-9,a-f]+}}:  b0 1e 20 00  xor %i0, 0, %i0
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_LE_LOX10 Local
 ! ASM: xor %i0, %tle_lox10(Local), %i0 ! encoding: [0xb0,0x1e,0x20,0x00]
-! ASM:                                !   fixup A - offset: 0, value: %tle_lox10(Local), kind: fixup_sparc_tls_le_lox10
         xor %i0, %tle_lox10(Local), %i0
 
 
@@ -48,44 +46,37 @@ foo:
 ! OBJDUMP: {{[0-9,a-f]+}}:  33 00 00 00  sethi 0, %i1
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_LDO_HIX22 Local
 ! ASM: sethi %tldo_hix22(Local), %i1 ! encoding: [0x33,0b00AAAAAA,A,A]
-! ASM:                              !   fixup A - offset: 0, value: %tldo_hix22(Local), kind: fixup_sparc_tls_ldo_hix22
         sethi %tldo_hix22(Local), %i1
 
 ! OBJDUMP: {{[0-9,a-f]+}}:  35 00 00 00  sethi 0, %i2
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_LDM_HI22 Local
 ! ASM: sethi %tldm_hi22(Local), %i2 ! encoding: [0x35,0b00AAAAAA,A,A]
-! ASM:                             !   fixup A - offset: 0, value: %tldm_hi22(Local), kind: fixup_sparc_tls_ldm_hi22
         sethi %tldm_hi22(Local), %i2
 
 ! OBJDUMP: {{[0-9,a-f]+}}:  b4 06 a0 00  add %i2, 0, %i2
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_LDM_LO10 Local
 ! ASM: add %i2, %tldm_lo10(Local), %i2 ! encoding: [0xb4,0x06,0b101000AA,A]
-! ASM:                                !   fixup A - offset: 0, value: %tldm_lo10(Local), kind: fixup_sparc_tls_ldm_lo10
         add %i2, %tldm_lo10(Local), %i2
 
 ! OBJDUMP: {{[0-9,a-f]+}}:  90 06 00 1a add %i0, %i2, %o0
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_LDM_ADD Local
 ! ASM: add %i0, %i2, %o0, %tldm_add(Local) ! encoding: [0x90,0x06,0x00,0x1a]
-! ASM:                                    !   fixup A - offset: 0, value: %tldm_add(Local), kind: fixup_sparc_tls_ldm_add
 	add %i0, %i2, %o0, %tldm_add(Local)
 
 ! OBJDUMP: {{[0-9,a-f]+}}:  b0 1e 60 00  xor %i1, 0, %i0
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_LDO_LOX10 Local
 ! ASM: xor %i1, %tldo_lox10(Local), %i0 ! encoding: [0xb0,0x1e,0b011000AA,A]
-! ASM:                                 !   fixup A - offset: 0, value: %tldo_lox10(Local), kind: fixup_sparc_tls_ldo_lox10
         xor %i1, %tldo_lox10(Local), %i0
 
 ! OBJDUMP: {{[0-9,a-f]+}}:  40 00 00 00 call 0
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_LDM_CALL Local
 ! ASM: call __tls_get_addr, %tldm_call(Local) ! encoding: [0x40,0x00,0x00,0x00]
-! ASM:                                       !   fixup A - offset: 0, value: %tldm_call(Local), kind: fixup_sparc_tls_ldm_call
         call __tls_get_addr, %tldm_call(Local)
         nop
 
 ! OBJDUMP: {{[0-9,a-f]+}}:  90 02 00 18 add %o0, %i0, %o0
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_LDO_ADD Local
 ! ASM: add %o0, %i0, %o0, %tldo_add(Local) ! encoding: [0x90,0x02,0x00,0x18]
-! ASM:                                    !   fixup A - offset: 0, value: %tldo_add(Local), kind: fixup_sparc_tls_ldo_add
         add %o0, %i0, %o0, %tldo_add(Local)
 
 ! Next two sequences are for extern symbols.
@@ -95,31 +86,26 @@ foo:
 ! OBJDUMP: {{[0-9,a-f]+}}:  33 00 00 00  sethi 0, %i1
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_IE_HI22 Extern
 ! ASM: sethi %tie_hi22(Extern), %i1 ! encoding: [0x33,0b00AAAAAA,A,A]
-! ASM:                                    !   fixup A - offset: 0, value: %tie_hi22(Extern), kind: fixup_sparc_tls_ie_hi22
 	sethi %tie_hi22(Extern), %i1
 
 ! OBJDUMP: {{[0-9,a-f]+}}:  b2 06 60 00  add %i1, 0, %i1
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_IE_LO10 Extern
 ! ASM: add %i1, %tie_lo10(Extern), %i1 ! encoding: [0xb2,0x06,0b011000AA,A]
-! ASM:                                    !   fixup A - offset: 0, value: %tie_lo10(Extern), kind: fixup_sparc_tls_ie_lo10
         add %i1, %tie_lo10(Extern), %i1
 
 ! OBJDUMP: {{[0-9,a-f]+}}:  f0 06 00 19  ld [%i0+%i1], %i0
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_IE_LD Extern
 ! ASM: ld [%i0+%i1], %i0, %tie_ld(Extern) ! encoding: [0xf0,0x06,0x00,0x19]
-! ASM:                                    !   fixup A - offset: 0, value: %tie_ld(Extern), kind: fixup_sparc_tls_ie_ld
         ld [%i0+%i1], %i0, %tie_ld(Extern)
 
 ! OBJDUMP: {{[0-9,a-f]+}}:  f0 5e 00 19  ldx [%i0+%i1], %i0
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_IE_LDX Extern
 ! ASM: ldx [%i0+%i1], %i0, %tie_ldx(Extern) ! encoding: [0xf0,0x5e,0x00,0x19]
-! ASM:                                      !   fixup A - offset: 0, value: %tie_ldx(Extern), kind: fixup_sparc_tls_ie_ldx
         ldx [%i0+%i1], %i0, %tie_ldx(Extern)
 
 ! OBJDUMP: {{[0-9,a-f]+}}:  90 01 c0 18  add %g7, %i0, %o0
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_IE_ADD Extern
 ! ASM: add %g7, %i0, %o0, %tie_add(Extern) ! encoding: [0x90,0x01,0xc0,0x18]
-! ASM:                                    !   fixup A - offset: 0, value: %tie_add(Extern), kind: fixup_sparc_tls_ie_add
         add %g7, %i0, %o0, %tie_add(Extern)
 
 ! General Dynamic model
@@ -128,25 +114,21 @@ foo:
 ! OBJDUMP: {{[0-9,a-f]+}}:  33 00 00 00  sethi 0, %i1
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_GD_HI22 Extern
 ! ASM:  sethi %tgd_hi22(Extern), %i1    ! encoding: [0x33,0b00AAAAAA,A,A]
-! ASM:                                    !   fixup A - offset: 0, value: %tgd_hi22(Extern), kind: fixup_sparc_tls_gd_hi22
         sethi %tgd_hi22(Extern), %i1
 
 ! OBJDUMP: {{[0-9,a-f]+}}:  b2 06 60 00  add %i1, 0, %i1
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_GD_LO10 Extern
 ! ASM: add %i1, %tgd_lo10(Extern), %i1 ! encoding: [0xb2,0x06,0b011000AA,A]
-! ASM:                                 !   fixup A - offset: 0, value: %tgd_lo10(Extern), kind: fixup_sparc_tls_gd_lo10
         add %i1, %tgd_lo10(Extern), %i1
 
 ! OBJDUMP: {{[0-9,a-f]+}}:  90 06 00 19  add %i0, %i1, %o0
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_GD_ADD Extern
 ! ASM: add %i0, %i1, %o0, %tgd_add(Extern) ! encoding: [0x90,0x06,0x00,0x19]
-! ASM:                                    !   fixup A - offset: 0, value: %tgd_add(Extern), kind: fixup_sparc_tls_gd_add
         add %i0, %i1, %o0, %tgd_add(Extern)
 
 ! OBJDUMP: {{[0-9,a-f]+}}:  40 00 00 00 call 0
 ! OBJDUMP: {{[0-9,a-f]+}}:     R_SPARC_TLS_GD_CALL Extern
 ! ASM: call __tls_get_addr, %tgd_call(Extern) ! encoding: [0x40,0x00,0x00,0x00]
-! ASM:                                        !   fixup A - offset: 0, value: %tgd_call(Extern), kind: fixup_sparc_tls_gd_call
         call __tls_get_addr, %tgd_call(Extern)
 
         .type  Local, at object

diff  --git a/llvm/test/MC/Sparc/sparc64-ctrl-instructions.s b/llvm/test/MC/Sparc/sparc64-ctrl-instructions.s
index 188947314f4b7..8681eacd0a7b5 100644
--- a/llvm/test/MC/Sparc/sparc64-ctrl-instructions.s
+++ b/llvm/test/MC/Sparc/sparc64-ctrl-instructions.s
@@ -2,59 +2,45 @@
 
 
         ! CHECK: bne %xcc, .BB0     ! encoding: [0x12,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bne %xcc, .BB0
 
         ! CHECK: be %xcc, .BB0      ! encoding: [0x02,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         be %xcc, .BB0
 
         ! CHECK: bg %xcc, .BB0      ! encoding: [0x14,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bg %xcc, .BB0
 
         ! CHECK: ble %xcc, .BB0      ! encoding: [0x04,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         ble %xcc, .BB0
 
         ! CHECK: bge %xcc, .BB0      ! encoding: [0x16,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bge %xcc, .BB0
 
         ! CHECK: bl %xcc, .BB0      ! encoding: [0x06,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bl %xcc, .BB0
 
         ! CHECK: bgu %xcc, .BB0      ! encoding: [0x18,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bgu %xcc, .BB0
 
         ! CHECK: bleu %xcc, .BB0      ! encoding: [0x08,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bleu %xcc, .BB0
 
         ! CHECK: bcc %xcc, .BB0      ! encoding: [0x1a,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcc %xcc, .BB0
 
         ! CHECK: bcs %xcc, .BB0      ! encoding: [0x0a,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcs %xcc, .BB0
 
         ! CHECK: bpos %xcc, .BB0      ! encoding: [0x1c,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bpos %xcc, .BB0
 
         ! CHECK: bneg %xcc, .BB0      ! encoding: [0x0c,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bneg %xcc, .BB0
 
         ! CHECK: bvc %xcc, .BB0      ! encoding: [0x1e,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvc %xcc, .BB0
 
         ! CHECK: bvs %xcc, .BB0      ! encoding: [0x0e,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvs %xcc, .BB0
 
 
@@ -234,893 +220,670 @@
         fmovso   %fcc0, %f1, %f2
 
         ! CHECK: bne,a %icc, .BB0     ! encoding: [0x32,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bne,a %icc, .BB0
 
         ! CHECK: be,a %icc, .BB0      ! encoding: [0x22,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         be,a %icc, .BB0
 
         ! CHECK: bg,a %icc, .BB0      ! encoding: [0x34,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bg,a %icc, .BB0
 
         ! CHECK: ble,a %icc, .BB0      ! encoding: [0x24,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         ble,a %icc, .BB0
 
         ! CHECK: bge,a %icc, .BB0      ! encoding: [0x36,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bge,a %icc, .BB0
 
         ! CHECK: bl,a %icc, .BB0      ! encoding: [0x26,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bl,a %icc, .BB0
 
         ! CHECK: bgu,a %icc, .BB0      ! encoding: [0x38,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bgu,a %icc, .BB0
 
         ! CHECK: bleu,a %icc, .BB0      ! encoding: [0x28,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bleu,a %icc, .BB0
 
         ! CHECK: bcc,a %icc, .BB0      ! encoding: [0x3a,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcc,a %icc, .BB0
 
         ! CHECK: bcs,a %icc, .BB0      ! encoding: [0x2a,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcs,a %icc, .BB0
 
         ! CHECK: bpos,a %icc, .BB0      ! encoding: [0x3c,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bpos,a %icc, .BB0
 
         ! CHECK: bneg,a %icc, .BB0      ! encoding: [0x2c,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bneg,a %icc, .BB0
 
         ! CHECK: bvc,a %icc, .BB0      ! encoding: [0x3e,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvc,a %icc, .BB0
 
         ! CHECK: bvs,a %icc, .BB0      ! encoding: [0x2e,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvs,a %icc, .BB0
 
         ! CHECK: bne,pn %icc, .BB0     ! encoding: [0x12,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bne,pn %icc, .BB0
 
         ! CHECK: be,pn %icc, .BB0      ! encoding: [0x02,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         be,pn %icc, .BB0
 
         ! CHECK: bg,pn %icc, .BB0      ! encoding: [0x14,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bg,pn %icc, .BB0
 
         ! CHECK: ble,pn %icc, .BB0      ! encoding: [0x04,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         ble,pn %icc, .BB0
 
         ! CHECK: bge,pn %icc, .BB0      ! encoding: [0x16,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bge,pn %icc, .BB0
 
         ! CHECK: bl,pn %icc, .BB0      ! encoding: [0x06,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bl,pn %icc, .BB0
 
         ! CHECK: bgu,pn %icc, .BB0      ! encoding: [0x18,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bgu,pn %icc, .BB0
 
         ! CHECK: bleu,pn %icc, .BB0      ! encoding: [0x08,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bleu,pn %icc, .BB0
 
         ! CHECK: bcc,pn %icc, .BB0      ! encoding: [0x1a,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcc,pn %icc, .BB0
 
         ! CHECK: bcs,pn %icc, .BB0      ! encoding: [0x0a,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcs,pn %icc, .BB0
 
         ! CHECK: bpos,pn %icc, .BB0      ! encoding: [0x1c,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bpos,pn %icc, .BB0
 
         ! CHECK: bneg,pn %icc, .BB0      ! encoding: [0x0c,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bneg,pn %icc, .BB0
 
         ! CHECK: bvc,pn %icc, .BB0      ! encoding: [0x1e,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvc,pn %icc, .BB0
 
         ! CHECK: bvs,pn %icc, .BB0      ! encoding: [0x0e,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvs,pn %icc, .BB0
 
         ! CHECK: bne,a,pn %icc, .BB0     ! encoding: [0x32,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bne,a,pn %icc, .BB0
 
         ! CHECK: be,a,pn %icc, .BB0      ! encoding: [0x22,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         be,a,pn %icc, .BB0
 
         ! CHECK: bg,a,pn %icc, .BB0      ! encoding: [0x34,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bg,a,pn %icc, .BB0
 
         ! CHECK: ble,a,pn %icc, .BB0      ! encoding: [0x24,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         ble,a,pn %icc, .BB0
 
         ! CHECK: bge,a,pn %icc, .BB0      ! encoding: [0x36,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bge,a,pn %icc, .BB0
 
         ! CHECK: bl,a,pn %icc, .BB0      ! encoding: [0x26,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bl,a,pn %icc, .BB0
 
         ! CHECK: bgu,a,pn %icc, .BB0      ! encoding: [0x38,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bgu,a,pn %icc, .BB0
 
         ! CHECK: bleu,a,pn %icc, .BB0      ! encoding: [0x28,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bleu,a,pn %icc, .BB0
 
         ! CHECK: bcc,a,pn %icc, .BB0      ! encoding: [0x3a,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcc,a,pn %icc, .BB0
 
         ! CHECK: bcs,a,pn %icc, .BB0      ! encoding: [0x2a,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcs,a,pn %icc, .BB0
 
         ! CHECK: bpos,a,pn %icc, .BB0      ! encoding: [0x3c,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bpos,a,pn %icc, .BB0
 
         ! CHECK: bneg,a,pn %icc, .BB0      ! encoding: [0x2c,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bneg,a,pn %icc, .BB0
 
         ! CHECK: bvc,a,pn %icc, .BB0      ! encoding: [0x3e,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvc,a,pn %icc, .BB0
 
         ! CHECK: bvs,a,pn %icc, .BB0      ! encoding: [0x2e,0b01000AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvs,a,pn %icc, .BB0
 
         ! CHECK: bne %icc, .BB0     ! encoding: [0x12,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bne,pt %icc, .BB0
 
         ! CHECK: be %icc, .BB0      ! encoding: [0x02,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         be,pt %icc, .BB0
 
         ! CHECK: bg %icc, .BB0      ! encoding: [0x14,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bg,pt %icc, .BB0
 
         ! CHECK: ble %icc, .BB0      ! encoding: [0x04,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         ble,pt %icc, .BB0
 
         ! CHECK: bge %icc, .BB0      ! encoding: [0x16,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bge,pt %icc, .BB0
 
         ! CHECK: bl %icc, .BB0      ! encoding: [0x06,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bl,pt %icc, .BB0
 
         ! CHECK: bgu %icc, .BB0      ! encoding: [0x18,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bgu,pt %icc, .BB0
 
         ! CHECK: bleu %icc, .BB0      ! encoding: [0x08,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bleu,pt %icc, .BB0
 
         ! CHECK: bcc %icc, .BB0      ! encoding: [0x1a,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcc,pt %icc, .BB0
 
         ! CHECK: bcs %icc, .BB0      ! encoding: [0x0a,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcs,pt %icc, .BB0
 
         ! CHECK: bpos %icc, .BB0      ! encoding: [0x1c,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bpos,pt %icc, .BB0
 
         ! CHECK: bneg %icc, .BB0      ! encoding: [0x0c,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bneg,pt %icc, .BB0
 
         ! CHECK: bvc %icc, .BB0      ! encoding: [0x1e,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvc,pt %icc, .BB0
 
         ! CHECK: bvs %icc, .BB0      ! encoding: [0x0e,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvs,pt %icc, .BB0
 
         ! CHECK: bne,a %icc, .BB0     ! encoding: [0x32,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bne,a,pt %icc, .BB0
 
         ! CHECK: be,a %icc, .BB0      ! encoding: [0x22,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         be,a,pt %icc, .BB0
 
         ! CHECK: bg,a %icc, .BB0      ! encoding: [0x34,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bg,a,pt %icc, .BB0
 
         ! CHECK: ble,a %icc, .BB0      ! encoding: [0x24,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         ble,a,pt %icc, .BB0
 
         ! CHECK: bge,a %icc, .BB0      ! encoding: [0x36,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bge,a,pt %icc, .BB0
 
         ! CHECK: bl,a %icc, .BB0      ! encoding: [0x26,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bl,a,pt %icc, .BB0
 
         ! CHECK: bgu,a %icc, .BB0      ! encoding: [0x38,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bgu,a,pt %icc, .BB0
 
         ! CHECK: bleu,a %icc, .BB0      ! encoding: [0x28,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bleu,a,pt %icc, .BB0
 
         ! CHECK: bcc,a %icc, .BB0      ! encoding: [0x3a,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcc,a,pt %icc, .BB0
 
         ! CHECK: bcs,a %icc, .BB0      ! encoding: [0x2a,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcs,a,pt %icc, .BB0
 
         ! CHECK: bpos,a %icc, .BB0      ! encoding: [0x3c,0b01001AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bpos,a,pt %icc, .BB0
 
 
         ! CHECK: bne,a %xcc, .BB0     ! encoding: [0x32,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bne,a %xcc, .BB0
 
         ! CHECK: be,a %xcc, .BB0      ! encoding: [0x22,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         be,a %xcc, .BB0
 
         ! CHECK: bg,a %xcc, .BB0      ! encoding: [0x34,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bg,a %xcc, .BB0
 
         ! CHECK: ble,a %xcc, .BB0      ! encoding: [0x24,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         ble,a %xcc, .BB0
 
         ! CHECK: bge,a %xcc, .BB0      ! encoding: [0x36,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bge,a %xcc, .BB0
 
         ! CHECK: bl,a %xcc, .BB0      ! encoding: [0x26,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bl,a %xcc, .BB0
 
         ! CHECK: bgu,a %xcc, .BB0      ! encoding: [0x38,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bgu,a %xcc, .BB0
 
         ! CHECK: bleu,a %xcc, .BB0      ! encoding: [0x28,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bleu,a %xcc, .BB0
 
         ! CHECK: bcc,a %xcc, .BB0      ! encoding: [0x3a,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcc,a %xcc, .BB0
 
         ! CHECK: bcs,a %xcc, .BB0      ! encoding: [0x2a,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcs,a %xcc, .BB0
 
         ! CHECK: bpos,a %xcc, .BB0      ! encoding: [0x3c,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bpos,a %xcc, .BB0
 
         ! CHECK: bneg,a %xcc, .BB0      ! encoding: [0x2c,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bneg,a %xcc, .BB0
 
         ! CHECK: bvc,a %xcc, .BB0      ! encoding: [0x3e,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvc,a %xcc, .BB0
 
         ! CHECK: bvs,a %xcc, .BB0      ! encoding: [0x2e,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvs,a %xcc, .BB0
 
         ! CHECK: bne,pn %xcc, .BB0     ! encoding: [0x12,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bne,pn %xcc, .BB0
 
         ! CHECK: be,pn %xcc, .BB0      ! encoding: [0x02,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         be,pn %xcc, .BB0
 
         ! CHECK: bg,pn %xcc, .BB0      ! encoding: [0x14,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bg,pn %xcc, .BB0
 
         ! CHECK: ble,pn %xcc, .BB0      ! encoding: [0x04,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         ble,pn %xcc, .BB0
 
         ! CHECK: bge,pn %xcc, .BB0      ! encoding: [0x16,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bge,pn %xcc, .BB0
 
         ! CHECK: bl,pn %xcc, .BB0      ! encoding: [0x06,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bl,pn %xcc, .BB0
 
         ! CHECK: bgu,pn %xcc, .BB0      ! encoding: [0x18,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bgu,pn %xcc, .BB0
 
         ! CHECK: bleu,pn %xcc, .BB0      ! encoding: [0x08,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bleu,pn %xcc, .BB0
 
         ! CHECK: bcc,pn %xcc, .BB0      ! encoding: [0x1a,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcc,pn %xcc, .BB0
 
         ! CHECK: bcs,pn %xcc, .BB0      ! encoding: [0x0a,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcs,pn %xcc, .BB0
 
         ! CHECK: bpos,pn %xcc, .BB0      ! encoding: [0x1c,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bpos,pn %xcc, .BB0
 
         ! CHECK: bneg,pn %xcc, .BB0      ! encoding: [0x0c,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bneg,pn %xcc, .BB0
 
         ! CHECK: bvc,pn %xcc, .BB0      ! encoding: [0x1e,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvc,pn %xcc, .BB0
 
         ! CHECK: bvs,pn %xcc, .BB0      ! encoding: [0x0e,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvs,pn %xcc, .BB0
 
         ! CHECK: bne,a,pn %xcc, .BB0     ! encoding: [0x32,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bne,a,pn %xcc, .BB0
 
         ! CHECK: be,a,pn %xcc, .BB0      ! encoding: [0x22,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         be,a,pn %xcc, .BB0
 
         ! CHECK: bg,a,pn %xcc, .BB0      ! encoding: [0x34,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bg,a,pn %xcc, .BB0
 
         ! CHECK: ble,a,pn %xcc, .BB0      ! encoding: [0x24,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         ble,a,pn %xcc, .BB0
 
         ! CHECK: bge,a,pn %xcc, .BB0      ! encoding: [0x36,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bge,a,pn %xcc, .BB0
 
         ! CHECK: bl,a,pn %xcc, .BB0      ! encoding: [0x26,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bl,a,pn %xcc, .BB0
 
         ! CHECK: bgu,a,pn %xcc, .BB0      ! encoding: [0x38,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bgu,a,pn %xcc, .BB0
 
         ! CHECK: bleu,a,pn %xcc, .BB0      ! encoding: [0x28,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bleu,a,pn %xcc, .BB0
 
         ! CHECK: bcc,a,pn %xcc, .BB0      ! encoding: [0x3a,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcc,a,pn %xcc, .BB0
 
         ! CHECK: bcs,a,pn %xcc, .BB0      ! encoding: [0x2a,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcs,a,pn %xcc, .BB0
 
         ! CHECK: bpos,a,pn %xcc, .BB0      ! encoding: [0x3c,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bpos,a,pn %xcc, .BB0
 
         ! CHECK: bneg,a,pn %xcc, .BB0      ! encoding: [0x2c,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bneg,a,pn %xcc, .BB0
 
         ! CHECK: bvc,a,pn %xcc, .BB0      ! encoding: [0x3e,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvc,a,pn %xcc, .BB0
 
         ! CHECK: bvs,a,pn %xcc, .BB0      ! encoding: [0x2e,0b01100AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvs,a,pn %xcc, .BB0
 
         ! CHECK: bne %xcc, .BB0     ! encoding: [0x12,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bne,pt %xcc, .BB0
 
         ! CHECK: be %xcc, .BB0      ! encoding: [0x02,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         be,pt %xcc, .BB0
 
         ! CHECK: bg %xcc, .BB0      ! encoding: [0x14,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bg,pt %xcc, .BB0
 
         ! CHECK: ble %xcc, .BB0      ! encoding: [0x04,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         ble,pt %xcc, .BB0
 
         ! CHECK: bge %xcc, .BB0      ! encoding: [0x16,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bge,pt %xcc, .BB0
 
         ! CHECK: bl %xcc, .BB0      ! encoding: [0x06,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bl,pt %xcc, .BB0
 
         ! CHECK: bgu %xcc, .BB0      ! encoding: [0x18,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bgu,pt %xcc, .BB0
 
         ! CHECK: bleu %xcc, .BB0      ! encoding: [0x08,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bleu,pt %xcc, .BB0
 
         ! CHECK: bcc %xcc, .BB0      ! encoding: [0x1a,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcc,pt %xcc, .BB0
 
         ! CHECK: bcs %xcc, .BB0      ! encoding: [0x0a,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcs,pt %xcc, .BB0
 
         ! CHECK: bpos %xcc, .BB0      ! encoding: [0x1c,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bpos,pt %xcc, .BB0
 
         ! CHECK: bneg %xcc, .BB0      ! encoding: [0x0c,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bneg,pt %xcc, .BB0
 
         ! CHECK: bvc %xcc, .BB0      ! encoding: [0x1e,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvc,pt %xcc, .BB0
 
         ! CHECK: bvs %xcc, .BB0      ! encoding: [0x0e,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bvs,pt %xcc, .BB0
 
         ! CHECK: bne,a %xcc, .BB0     ! encoding: [0x32,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bne,a,pt %xcc, .BB0
 
         ! CHECK: be,a %xcc, .BB0      ! encoding: [0x22,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         be,a,pt %xcc, .BB0
 
         ! CHECK: bg,a %xcc, .BB0      ! encoding: [0x34,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bg,a,pt %xcc, .BB0
 
         ! CHECK: ble,a %xcc, .BB0      ! encoding: [0x24,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         ble,a,pt %xcc, .BB0
 
         ! CHECK: bge,a %xcc, .BB0      ! encoding: [0x36,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bge,a,pt %xcc, .BB0
 
         ! CHECK: bl,a %xcc, .BB0      ! encoding: [0x26,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bl,a,pt %xcc, .BB0
 
         ! CHECK: bgu,a %xcc, .BB0      ! encoding: [0x38,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bgu,a,pt %xcc, .BB0
 
         ! CHECK: bleu,a %xcc, .BB0      ! encoding: [0x28,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bleu,a,pt %xcc, .BB0
 
         ! CHECK: bcc,a %xcc, .BB0      ! encoding: [0x3a,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcc,a,pt %xcc, .BB0
 
         ! CHECK: bcs,a %xcc, .BB0      ! encoding: [0x2a,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bcs,a,pt %xcc, .BB0
 
         ! CHECK: bpos,a %xcc, .BB0      ! encoding: [0x3c,0b01101AAA,A,A]
-        ! CHECK-NEXT:         ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         bpos,a,pt %xcc, .BB0
 
         ! CHECK:             fba %fcc0, .BB0                        ! encoding: [0x11,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fba %fcc0, .BB0
 
         ! CHECK:             fba %fcc0, .BB0                        ! encoding: [0x11,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fb %fcc0, .BB0
 
         ! CHECK:             fbn %fcc0, .BB0                        ! encoding: [0x01,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbn %fcc0, .BB0
 
         ! CHECK:             fbu %fcc0, .BB0                      ! encoding: [0x0f,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbu %fcc0, .BB0
 
         ! CHECK:             fbg %fcc0, .BB0                      ! encoding: [0x0d,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbg %fcc0, .BB0
         ! CHECK:             fbug %fcc0, .BB0                     ! encoding: [0x0b,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbug %fcc0, .BB0
 
         ! CHECK:             fbl %fcc0, .BB0                      ! encoding: [0x09,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbl %fcc0, .BB0
 
         ! CHECK:             fbul %fcc0, .BB0                     ! encoding: [0x07,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbul %fcc0, .BB0
 
         ! CHECK:             fblg %fcc0, .BB0                     ! encoding: [0x05,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fblg %fcc0, .BB0
 
         ! CHECK:             fbne %fcc0, .BB0                     ! encoding: [0x03,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbne %fcc0, .BB0
 
         ! CHECK:             fbe %fcc0, .BB0                      ! encoding: [0x13,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbe %fcc0, .BB0
 
         ! CHECK:             fbue %fcc0, .BB0                     ! encoding: [0x15,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbue %fcc0, .BB0
 
         ! CHECK:             fbge %fcc0, .BB0                     ! encoding: [0x17,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbge %fcc0, .BB0
 
         ! CHECK:             fbuge %fcc0, .BB0                    ! encoding: [0x19,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbuge %fcc0, .BB0
 
         ! CHECK:             fble %fcc0, .BB0                     ! encoding: [0x1b,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fble %fcc0, .BB0
 
         ! CHECK:             fbule %fcc0, .BB0                    ! encoding: [0x1d,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbule %fcc0, .BB0
 
         ! CHECK:             fbo %fcc0, .BB0                      ! encoding: [0x1f,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbo %fcc0, .BB0
 
         ! CHECK:             fbu %fcc0, .BB0                      ! encoding: [0x0f,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbu,pt %fcc0, .BB0
 
         ! CHECK:             fbg %fcc0, .BB0                      ! encoding: [0x0d,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbg,pt %fcc0, .BB0
         ! CHECK:             fbug %fcc0, .BB0                     ! encoding: [0x0b,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbug,pt %fcc0, .BB0
 
         ! CHECK:             fbl %fcc0, .BB0                      ! encoding: [0x09,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbl,pt %fcc0, .BB0
 
         ! CHECK:             fbul %fcc0, .BB0                     ! encoding: [0x07,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbul,pt %fcc0, .BB0
 
         ! CHECK:             fblg %fcc0, .BB0                     ! encoding: [0x05,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fblg,pt %fcc0, .BB0
 
         ! CHECK:             fbne %fcc0, .BB0                     ! encoding: [0x03,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbne,pt %fcc0, .BB0
 
         ! CHECK:             fbe %fcc0, .BB0                      ! encoding: [0x13,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbe,pt %fcc0, .BB0
 
         ! CHECK:             fbue %fcc0, .BB0                     ! encoding: [0x15,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbue,pt %fcc0, .BB0
 
         ! CHECK:             fbge %fcc0, .BB0                     ! encoding: [0x17,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbge,pt %fcc0, .BB0
 
         ! CHECK:             fbuge %fcc0, .BB0                    ! encoding: [0x19,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbuge,pt %fcc0, .BB0
 
         ! CHECK:             fble %fcc0, .BB0                     ! encoding: [0x1b,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fble,pt %fcc0, .BB0
 
         ! CHECK:             fbule %fcc0, .BB0                    ! encoding: [0x1d,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbule,pt %fcc0, .BB0
 
         ! CHECK:             fbo %fcc0, .BB0                      ! encoding: [0x1f,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbo,pt %fcc0, .BB0
 
 
         ! CHECK:             fbo,a %fcc0, .BB0                      ! encoding: [0x3f,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbo,a %fcc0, .BB0
 
         ! CHECK:             fbu,a %fcc0, .BB0                      ! encoding: [0x2f,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbu,a %fcc0, .BB0
 
         ! CHECK:             fbg,a %fcc0, .BB0                      ! encoding: [0x2d,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbg,a %fcc0, .BB0
         ! CHECK:             fbug,a %fcc0, .BB0                     ! encoding: [0x2b,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbug,a %fcc0, .BB0
 
         ! CHECK:             fbl,a %fcc0, .BB0                      ! encoding: [0x29,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbl,a %fcc0, .BB0
 
         ! CHECK:             fbul,a %fcc0, .BB0                     ! encoding: [0x27,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbul,a %fcc0, .BB0
 
         ! CHECK:             fblg,a %fcc0, .BB0                     ! encoding: [0x25,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fblg,a %fcc0, .BB0
 
         ! CHECK:             fbne,a %fcc0, .BB0                     ! encoding: [0x23,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbne,a %fcc0, .BB0
 
         ! CHECK:             fbe,a %fcc0, .BB0                      ! encoding: [0x33,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbe,a %fcc0, .BB0
 
         ! CHECK:             fbue,a %fcc0, .BB0                     ! encoding: [0x35,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbue,a %fcc0, .BB0
 
         ! CHECK:             fbge,a %fcc0, .BB0                     ! encoding: [0x37,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbge,a %fcc0, .BB0
 
         ! CHECK:             fbuge,a %fcc0, .BB0                    ! encoding: [0x39,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbuge,a %fcc0, .BB0
 
         ! CHECK:             fble,a %fcc0, .BB0                     ! encoding: [0x3b,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fble,a %fcc0, .BB0
 
         ! CHECK:             fbule,a %fcc0, .BB0                    ! encoding: [0x3d,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbule,a %fcc0, .BB0
 
         ! CHECK:             fbo,a %fcc0, .BB0                      ! encoding: [0x3f,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbo,a %fcc0, .BB0
 
                 ! CHECK:             fbo,a %fcc0, .BB0                      ! encoding: [0x3f,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbo,a %fcc0, .BB0
 
         ! CHECK:             fbu,a %fcc0, .BB0                      ! encoding: [0x2f,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbu,a,pt %fcc0, .BB0
 
         ! CHECK:             fbg,a %fcc0, .BB0                      ! encoding: [0x2d,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbg,a,pt %fcc0, .BB0
 
         ! CHECK:             fbug,a %fcc0, .BB0                     ! encoding: [0x2b,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbug,a,pt %fcc0, .BB0
 
         ! CHECK:             fbl,a %fcc0, .BB0                      ! encoding: [0x29,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbl,a,pt %fcc0, .BB0
 
         ! CHECK:             fbul,a %fcc0, .BB0                     ! encoding: [0x27,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbul,a,pt %fcc0, .BB0
 
         ! CHECK:             fblg,a %fcc0, .BB0                     ! encoding: [0x25,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fblg,a,pt %fcc0, .BB0
 
         ! CHECK:             fbne,a %fcc0, .BB0                     ! encoding: [0x23,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbne,a,pt %fcc0, .BB0
 
         ! CHECK:             fbe,a %fcc0, .BB0                      ! encoding: [0x33,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbe,a,pt %fcc0, .BB0
 
         ! CHECK:             fbue,a %fcc0, .BB0                     ! encoding: [0x35,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbue,a,pt %fcc0, .BB0
 
         ! CHECK:             fbge,a %fcc0, .BB0                     ! encoding: [0x37,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbge,a,pt %fcc0, .BB0
 
         ! CHECK:             fbuge,a %fcc0, .BB0                    ! encoding: [0x39,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbuge,a,pt %fcc0, .BB0
 
         ! CHECK:             fble,a %fcc0, .BB0                     ! encoding: [0x3b,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fble,a,pt %fcc0, .BB0
 
         ! CHECK:             fbule,a %fcc0, .BB0                    ! encoding: [0x3d,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbule,a,pt %fcc0, .BB0
 
         ! CHECK:             fbo,a %fcc0, .BB0                      ! encoding: [0x3f,0b01001AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbo,a,pt %fcc0, .BB0
 
         ! CHECK:             fbu,pn %fcc0, .BB0                 ! encoding: [0x0f,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbu,pn %fcc0, .BB0
 
         ! CHECK:             fbg,pn %fcc0, .BB0                      ! encoding: [0x0d,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbg,pn %fcc0, .BB0
         ! CHECK:             fbug,pn %fcc0, .BB0                     ! encoding: [0x0b,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbug,pn %fcc0, .BB0
 
         ! CHECK:             fbl,pn %fcc0, .BB0                      ! encoding: [0x09,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbl,pn %fcc0, .BB0
 
         ! CHECK:             fbul,pn %fcc0, .BB0                     ! encoding: [0x07,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbul,pn %fcc0, .BB0
 
         ! CHECK:             fblg,pn %fcc0, .BB0                     ! encoding: [0x05,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fblg,pn %fcc0, .BB0
 
         ! CHECK:             fbne,pn %fcc0, .BB0                     ! encoding: [0x03,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbne,pn %fcc0, .BB0
 
         ! CHECK:             fbe,pn %fcc0, .BB0                      ! encoding: [0x13,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbe,pn %fcc0, .BB0
 
         ! CHECK:             fbue,pn %fcc0, .BB0                     ! encoding: [0x15,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbue,pn %fcc0, .BB0
 
         ! CHECK:             fbge,pn %fcc0, .BB0                     ! encoding: [0x17,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbge,pn %fcc0, .BB0
 
         ! CHECK:             fbuge,pn %fcc0, .BB0                    ! encoding: [0x19,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbuge,pn %fcc0, .BB0
 
         ! CHECK:             fble,pn %fcc0, .BB0                     ! encoding: [0x1b,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fble,pn %fcc0, .BB0
 
         ! CHECK:             fbule,pn %fcc0, .BB0                    ! encoding: [0x1d,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbule,pn %fcc0, .BB0
 
         ! CHECK:             fbo,pn %fcc0, .BB0                      ! encoding: [0x1f,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbo,pn %fcc0, .BB0
 
                 ! CHECK:             fbu,a,pn %fcc0, .BB0                      ! encoding: [0x2f,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbu,a,pn %fcc0, .BB0
 
         ! CHECK:             fbg,a,pn %fcc0, .BB0                      ! encoding: [0x2d,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbg,a,pn %fcc0, .BB0
 
         ! CHECK:             fbug,a,pn %fcc0, .BB0                     ! encoding: [0x2b,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbug,a,pn %fcc0, .BB0
 
         ! CHECK:             fbl,a,pn %fcc0, .BB0                      ! encoding: [0x29,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbl,a,pn %fcc0, .BB0
 
         ! CHECK:             fbul,a,pn %fcc0, .BB0                     ! encoding: [0x27,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbul,a,pn %fcc0, .BB0
 
         ! CHECK:             fblg,a,pn %fcc0, .BB0                     ! encoding: [0x25,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fblg,a,pn %fcc0, .BB0
 
         ! CHECK:             fbne,a,pn %fcc0, .BB0                     ! encoding: [0x23,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbne,a,pn %fcc0, .BB0
 
         ! CHECK:             fbe,a,pn %fcc0, .BB0                      ! encoding: [0x33,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbe,a,pn %fcc0, .BB0
 
         ! CHECK:             fbue,a,pn %fcc0, .BB0                     ! encoding: [0x35,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbue,a,pn %fcc0, .BB0
 
         ! CHECK:             fbge,a,pn %fcc0, .BB0                     ! encoding: [0x37,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbge,a,pn %fcc0, .BB0
 
         ! CHECK:             fbuge,a,pn %fcc0, .BB0                    ! encoding: [0x39,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbuge,a,pn %fcc0, .BB0
 
         ! CHECK:             fble,a,pn %fcc0, .BB0                     ! encoding: [0x3b,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fble,a,pn %fcc0, .BB0
 
         ! CHECK:             fbule,a,pn %fcc0, .BB0                    ! encoding: [0x3d,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbule,a,pn %fcc0, .BB0
 
         ! CHECK:             fbo,a,pn %fcc0, .BB0                      ! encoding: [0x3f,0b01000AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbo,a,pn %fcc0, .BB0
 
         ! CHECK: movu %fcc1, %g1, %g2            ! encoding: [0x85,0x61,0xc8,0x01]
@@ -1130,38 +893,27 @@
         fmovsg %fcc2, %f1, %f2
 
         ! CHECK:             fbug %fcc3, .BB0                ! encoding: [0x0b,0b01111AAA,A,A]
-        ! CHECK-NEXT:                                        ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbug %fcc3, .BB0
 
         ! CHECK:             fbu %fcc3, .BB0                 ! encoding: [0x0f,0b01111AAA,A,A]
-        ! CHECK-NEXT:                                        ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbu,pt %fcc3, .BB0
 
         ! CHECK:             fbl,a %fcc3, .BB0               ! encoding: [0x29,0b01111AAA,A,A]
-        ! CHECK-NEXT:                                        ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbl,a %fcc3, .BB0
 
         ! CHECK:             fbue,pn %fcc3, .BB0             ! encoding: [0x15,0b01110AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbue,pn %fcc3, .BB0
 
         ! CHECK:             fbne,a,pn %fcc3, .BB0           ! encoding: [0x23,0b01110AAA,A,A]
-        ! CHECK-NEXT:                                        !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
         fbne,a,pn %fcc3, .BB0
 
 
         ! CHECK:                brz %g1, .BB0                   ! encoding: [0x02'A',0xc8'A',0x40'A',A]
-        ! CHECK-NEXT:                                           !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br16
         ! CHECK:                brlez %g1, .BB0                 ! encoding: [0x04'A',0xc8'A',0x40'A',A]
-        ! CHECK-NEXT:                                           !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br16
         ! CHECK:                brlz %g1, .BB0                  ! encoding: [0x06'A',0xc8'A',0x40'A',A]
-        ! CHECK-NEXT:                                           !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br16
         ! CHECK:                brnz %g1, .BB0                  ! encoding: [0x0a'A',0xc8'A',0x40'A',A]
-        ! CHECK-NEXT:                                           !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br16
         ! CHECK:                brgz %g1, .BB0                  ! encoding: [0x0c'A',0xc8'A',0x40'A',A]
-        ! CHECK-NEXT:                                           !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br16
         ! CHECK:                brgez %g1, .BB0                 ! encoding: [0x0e'A',0xc8'A',0x40'A',A]
-        ! CHECK-NEXT:                                           !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br16
 
         brz   %g1, .BB0
         brlez %g1, .BB0
@@ -1171,23 +923,18 @@
         brgez %g1, .BB0
 
         ! CHECK: brz %g1, .BB0                   ! encoding: [0x02'A',0xc8'A',0x40'A',A]
-        ! CHECK-NEXT:                            !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br16
         brz,pt   %g1, .BB0
 
         ! CHECK: brz,a %g1, .BB0                 ! encoding: [0x22'A',0xc8'A',0x40'A',A]
-        ! CHECK-NEXT:                            !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br16
         brz,a   %g1, .BB0
 
         ! CHECK: brz,a %g1, .BB0                 ! encoding: [0x22'A',0xc8'A',0x40'A',A]
-        ! CHECK-NEXT:                            !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br16
         brz,a,pt   %g1, .BB0
 
         ! CHECK:  brz,pn %g1, .BB0               ! encoding: [0x02'A',0xc0'A',0x40'A',A]
-        ! CHECK-NEXT:                            !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br16
         brz,pn   %g1, .BB0
 
         ! CHECK:  brz,a,pn %g1, .BB0              ! encoding: [0x22'A',0xc0'A',0x40'A',A]
-        ! CHECK-NEXT:                             !   fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br16
         brz,a,pn   %g1, .BB0
 
         ! CHECK: movrz   %g1, %g2, %g3 ! encoding: [0x87,0x78,0x44,0x02]

diff  --git a/llvm/test/MC/Sparc/sparcv9-synthetic-instructions.s b/llvm/test/MC/Sparc/sparcv9-synthetic-instructions.s
index 0d14ff558b314..20da7fd1df3fb 100644
--- a/llvm/test/MC/Sparc/sparcv9-synthetic-instructions.s
+++ b/llvm/test/MC/Sparc/sparcv9-synthetic-instructions.s
@@ -24,29 +24,21 @@ setx (0-1), %g1, %o1
 ! V8:      error: instruction requires a CPU feature not currently enabled
 ! V8-NEXT: setx 0xffffffff, %g1, %o1
 ! V9: sethi %hi(4294967295), %o1      ! encoding: [0x13,0b00AAAAAA,A,A]
-! V9:                                 !   fixup A - offset: 0, value: %hi(4294967295), kind: fixup_sparc_hi22
 ! V9: or %o1, %lo(4294967295), %o1    ! encoding: [0x92,0x12,0b011000AA,A]
-! V9:                                 !   fixup A - offset: 0, value: %lo(4294967295), kind: fixup_sparc_lo10
 setx 0xffffffff, %g1, %o1
 
 ! V8:      error: instruction requires a CPU feature not currently enabled
 ! V8-NEXT: setx (0xffff0000+0x0000ffff), %g1, %o1
 ! V9: sethi %hi(4294967295), %o1      ! encoding: [0x13,0b00AAAAAA,A,A]
-! V9:                                 !   fixup A - offset: 0, value: %hi(4294967295), kind: fixup_sparc_hi22
 ! V9: or %o1, %lo(4294967295), %o1    ! encoding: [0x92,0x12,0b011000AA,A]
-! V9:                                 !   fixup A - offset: 0, value: %lo(4294967295), kind: fixup_sparc_lo10
 setx (0xffff0000+0x0000ffff), %g1, %o1
 
 ! V8:      error: instruction requires a CPU feature not currently enabled
 ! V8-NEXT: setx 0x0123456789abcdef, %g1, %o0
 ! V9: sethi %hi(81985529216486895), %o0       ! encoding: [0x11,0b00AAAAAA,A,A]
-! V9:                                 !   fixup A - offset: 0, value: %hi(81985529216486895), kind: fixup_sparc_hi22
 ! V9: or %o0, %lo(81985529216486895), %o0     ! encoding: [0x90,0x12,0b001000AA,A]
-! V9:                                 !   fixup A - offset: 0, value: %lo(81985529216486895), kind: fixup_sparc_lo10
 ! V9: sethi %hh(81985529216486895), %g1       ! encoding: [0x03,0b00AAAAAA,A,A]
-! V9:                                 !   fixup A - offset: 0, value: %hh(81985529216486895), kind: fixup_sparc_hh
 ! V9: or %g1, %hm(81985529216486895), %g1     ! encoding: [0x82,0x10,0b011000AA,A]
-! V9:                                 !   fixup A - offset: 0, value: %hm(81985529216486895), kind: fixup_sparc_hm
 ! V9: sllx %g1, 32, %g1                       ! encoding: [0x83,0x28,0x70,0x20]
 ! V9: or %g1, %o0, %o0                        ! encoding: [0x90,0x10,0x40,0x08]
 setx 0x0123456789abcdef, %g1, %o0
@@ -54,13 +46,9 @@ setx 0x0123456789abcdef, %g1, %o0
 ! V8:      error: instruction requires a CPU feature not currently enabled
 ! V8-NEXT: setx (0x0123456700000000+0x0000000089abcdef), %g1, %o0
 ! V9: sethi %hi(81985529216486895), %o0       ! encoding: [0x11,0b00AAAAAA,A,A]
-! V9:                                 !   fixup A - offset: 0, value: %hi(81985529216486895), kind: fixup_sparc_hi22
 ! V9: or %o0, %lo(81985529216486895), %o0     ! encoding: [0x90,0x12,0b001000AA,A]
-! V9:                                 !   fixup A - offset: 0, value: %lo(81985529216486895), kind: fixup_sparc_lo10
 ! V9: sethi %hh(81985529216486895), %g1       ! encoding: [0x03,0b00AAAAAA,A,A]
-! V9:                                 !   fixup A - offset: 0, value: %hh(81985529216486895), kind: fixup_sparc_hh
 ! V9: or %g1, %hm(81985529216486895), %g1     ! encoding: [0x82,0x10,0b011000AA,A]
-! V9:                                 !   fixup A - offset: 0, value: %hm(81985529216486895), kind: fixup_sparc_hm
 ! V9: sllx %g1, 32, %g1                       ! encoding: [0x83,0x28,0x70,0x20]
 ! V9: or %g1, %o0, %o0                        ! encoding: [0x90,0x10,0x40,0x08]
 setx (0x0123456700000000+0x0000000089abcdef), %g1, %o0
@@ -68,13 +56,9 @@ setx (0x0123456700000000+0x0000000089abcdef), %g1, %o0
 ! V8:      error: instruction requires a CPU feature not currently enabled
 ! V8-NEXT: setx (.BB1-.BB0), %g1, %o0
 ! V9: sethi %hi(.BB1-.BB0), %o0               ! encoding: [0x11,0b00AAAAAA,A,A]
-! V9:                                 !   fixup A - offset: 0, value: %hi(.BB1-.BB0), kind: fixup_sparc_hi22
 ! V9: or %o0, %lo(.BB1-.BB0), %o0             ! encoding: [0x90,0x12,0b001000AA,A]
-! V9:                                 !   fixup A - offset: 0, value: %lo(.BB1-.BB0), kind: fixup_sparc_lo10
 ! V9: sethi %hh(.BB1-.BB0), %g1               ! encoding: [0x03,0b00AAAAAA,A,A]
-! V9:                                 !   fixup A - offset: 0, value: %hh(.BB1-.BB0), kind: fixup_sparc_hh
 ! V9: or %g1, %hm(.BB1-.BB0), %g1             ! encoding: [0x82,0x10,0b011000AA,A]
-! V9:                                 !   fixup A - offset: 0, value: %hm(.BB1-.BB0), kind: fixup_sparc_hm
 ! V9: sllx %g1, 32, %g1                       ! encoding: [0x83,0x28,0x70,0x20]
 ! V9: or %g1, %o0, %o0                        ! encoding: [0x90,0x10,0x40,0x08]
 setx (.BB1-.BB0), %g1, %o0
@@ -82,7 +66,6 @@ setx (.BB1-.BB0), %g1, %o0
 !! In V9, setuw is a mnemonic alias for set.
 ! V8:      error: invalid instruction mnemonic
 ! V9: sethi %hi(32768), %g1            ! encoding: [0x03,0b00AAAAAA,A,A]
-! V9:                                  !   fixup A - offset: 0, value: %hi(32768), kind: fixup_sparc_hi22
 setuw 32768, %g1
 ! V9: mov 1, %g1 ! encoding: [0x82,0x10,0x20,0x01]
 setuw 1, %g1
@@ -95,30 +78,22 @@ setsw 4095, %g1
 setsw -4096, %g1
 ! V8:      error: instruction requires a CPU feature not currently enabled
 ! V9: sethi %hi(4096), %g1            ! encoding: [0x03,0b00AAAAAA,A,A]
-! V9:                                 !   fixup A - offset: 0, value: %hi(4096), kind: fixup_sparc_hi22
 setsw 4096, %g1
 ! V8:      error: instruction requires a CPU feature not currently enabled
 ! V9: sethi %hi(-4097), %g1           ! encoding: [0x03,0b00AAAAAA,A,A]
-! V9:                                 !   fixup A - offset: 0, value: %hi(-4097), kind: fixup_sparc_hi22
 ! V9: sra %g1, %g0, %g1               ! encoding: [0x83,0x38,0x40,0x00]
 setsw -4097, %g1
 ! V8:      error: instruction requires a CPU feature not currently enabled
 ! V9: sethi %hi(2147483647), %o1      ! encoding: [0x13,0b00AAAAAA,A,A]
-! V9:                                 !   fixup A - offset: 0, value: %hi(2147483647), kind: fixup_sparc_hi22
 ! V9: or %o1, %lo(2147483647), %o1    ! encoding: [0x92,0x12,0b011000AA,A]
-! V9:                                 !   fixup A - offset: 0, value: %lo(2147483647), kind: fixup_sparc_lo10
 setsw 2147483647, %o1
 ! V8:      error: instruction requires a CPU feature not currently enabled
 ! V9: sethi %hi(-2147483647), %o1     ! encoding: [0x13,0b00AAAAAA,A,A]
-! V9:                                 !   fixup A - offset: 0, value: %hi(-2147483647), kind: fixup_sparc_hi22
 ! V9: or %o1, %lo(-2147483647), %o1   ! encoding: [0x92,0x12,0b011000AA,A]
-! V9:                                 !   fixup A - offset: 0, value: %lo(-2147483647), kind: fixup_sparc_lo10
 ! V9: sra %o1, %g0, %o1               ! encoding: [0x93,0x3a,0x40,0x00]
 setsw -2147483647, %o1
 ! V8:      error: instruction requires a CPU feature not currently enabled
 ! V9: sethi %hi(.Ltmp0), %o1          ! encoding: [0x13,0b00AAAAAA,A,A]
-! V9:                                 !   fixup A - offset: 0, value: %hi(.Ltmp0), kind: fixup_sparc_hi22
 ! V9: or %o1, %lo(.Ltmp0), %o1        ! encoding: [0x92,0x12,0b011000AA,A]
-! V9:                                 !   fixup A - offset: 0, value: %lo(.Ltmp0), kind: fixup_sparc_lo10
 ! V9: sra %o1, %g0, %o1               ! encoding: [0x93,0x3a,0x40,0x00]
 setsw ., %o1


        


More information about the llvm-commits mailing list