Index: test/MC/ARM/directive-eabi_attribute-2.s
===================================================================
--- test/MC/ARM/directive-eabi_attribute-2.s
+++ test/MC/ARM/directive-eabi_attribute-2.s
@@ -1,4 +1,6 @@
 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
+@ Don't forget to update test/MC/ARM/directive-eabi_attribute.s if you
+@ make changes here.
 
 	.syntax unified
 	.thumb
Index: test/MC/ARM/directive-eabi_attribute.s
===================================================================
--- test/MC/ARM/directive-eabi_attribute.s
+++ test/MC/ARM/directive-eabi_attribute.s
@@ -1,5 +1,7 @@
 @ RUN: llvm-mc < %s -triple armv7-unknown-linux-gnueabi -filetype=obj -o - \
 @ RUN:   | llvm-readobj -s -sd | FileCheck %s
+@ Don't forget to update test/MC/ARM/directive-eabi_attribute-2.s if you
+@ make changes here.
 
 @ CHECK: Name: .ARM.attribute
 @ CHECK: SectionData (
@@ -8,7 +10,7 @@
 @ CHECK: 41
 
 @ <section-length>
-@ CHECK: 250000 00
+@ CHECK: 620000 00
 
 @ <vendor-name> "aeabi\0"
 @ CHECK: 616561 626900
@@ -17,7 +19,7 @@
 @ CHECK: 01
 
 @ <size>
-@ CHECK: 1B000000
+@ CHECK: 58000000
 
 @ <attribute>*
 
@@ -36,9 +38,33 @@
 	.eabi_attribute 10, 3
 @ CHECK: 0A03
 
+	.eabi_attribute 11, 0
+@ CHECK: 0B00
+
 	.eabi_attribute 12, 1
 @ CHECK: 0C01
 
+	.eabi_attribute 13, 2
+@ CHECK: 0D02
+
+	.eabi_attribute 14, 0
+@ CHECK: 0E00
+
+	.eabi_attribute 15, 0
+@ CHECK: 0F00
+
+	.eabi_attribute 16, 0
+@ CHECK: 1000
+
+	.eabi_attribute 17, 0
+@ CHECK: 1100
+
+	.eabi_attribute 18, 4
+@ CHECK: 1204
+
+	.eabi_attribute 19, 1
+@ CHECK: 1301
+
 	.eabi_attribute 20, 1
 @ CHECK: 1401
 
@@ -53,4 +79,52 @@
 
 	.eabi_attribute 25, 1
 @ CHECK: 1901
+
+	.eabi_attribute 26, 3
+@ CHECK: 1A03
+
+	.eabi_attribute 27, 0
+@ CHECK: 1B00
+
+	.eabi_attribute 28, 1
+@ CHECK: 1C01
+
+	.eabi_attribute 29, 0
+@ CHECK: 1D00
+
+	.eabi_attribute 31, 1
+@ CHECK: 1F01
+
+	.eabi_attribute 32, 1, "aeabi"
+@ CHECK: 20014145 414249
+
+	.eabi_attribute 34, 0
+@ CHECK: 2200
+
+	.eabi_attribute 36, 0
+@ CHECK: 2400
+
+	.eabi_attribute 38, 0
+@ CHECK: 2600
+
+	.eabi_attribute 42, 0
+@ CHECK 3000
+
+	.eabi_attribute 44, 0
+@ CHECK 3200
+
+	.eabi_attribute 64, 0
+@ CHECK 4000
+
+	.eabi_attribute 65, "gnu"
+@ CHECK: 41474E55
+
+	.eabi_attribute 66, 0
+@ CHECK 4200
+
+	.eabi_attribute 67, "2.09"
+@ CHECK: 43 322E3039
+
+	.eabi_attribute 68, 0
+@ CHECK 4400
 @ CHECK: )