Create an unified binutils source tree for both Android and ChromiumOS.

About source code - The base version of this binutils is newer than that
of aosp/binutils-2.25, it is based on the binutils that is used to build
google products and ChromiumOS. And it contains *all* local Android
patches as well as all patches that are cherry-picked from upstream for
aosp/binutils-2.25 tree (up to Nov. 5 - 932d71b85). You may find the
detailed development history for this binutils tree here -
https://chromium.googlesource.com/chromiumos/third_party/binutils/+log/unification
(This CL is a combination of all the CLs in it. After this CL is
submitted the tree will be identical to
https://chromium.googlesource.com/chromiumos/third_party/binutils/+log/unification
at 2865a3615d80bd5f82d14d7e0484e84dc052596a)

About testing - We tested this binutils for both ChromiumOS and
Android. For android, we tested building N4, N5X, N6, N7, N9 using new
binutils, we also did a full-build of toolchain (by build.py) and built
a N5X image; for ChromiumOS - it passed ChromiumOS toolchain release
tests on all 4 platforms (x86, x86_64, arm32 and arm64).

Change-Id: I2bb2cf579f9458d0a8bc9612331dc7d5043e3d82

15 files changed, 142 insertions, 36 deletions

diff --git a/binutils-2.25/gas/testsuite/ChangeLog b/binutils-2.25/gas/testsuite/ChangeLog
index 51c1cb4..8c3e136 100644
--- a/binutils-2.25/gas/testsuite/ChangeLog
+++ b/binutils-2.25/gas/testsuite/ChangeLog
@@ -1,7 +1,11 @@
-2014-11-18  Igor Zamyatin  <igor.zamyatin@intel.com>
+2015-05-07  Renlin Li  <renlin.li@arm.com>
 
-	* gas/i386/x86-64-mpx-branch-1.d: Don't use *_BND relocations.
-	* gas/i386/x86-64-mpx-branch-2.d: Likewise.
+	Applied from master.
+	2015-03-10  Renlin Li  <renlin.li@arm.com>
+
+	* gas/aarch64/ldst-reg-uns-imm.d: Adjust expected output.
+	* gas/aarch64/ldst-reg-unscaled-imm.d: Likewise.
+	* gas/aarch64/reloc-insn.d: Likewise.
 
 2014-11-17  Ilya Tocar  <ilya.tocar@intel.com>
 
@@ -55,38 +59,52 @@
 	* gas/i386/x86-64-clwb.d: Likewise.
 	* gas/i386/x86-64-clwb.s: Likewise.
 
-2014-11-10  Matthew Fortune  <matthew.fortune@imgtec.com>
+2014-11-13  H.J. Lu  <hongjiu.lu@intel.com>
 
-	Apply trunk patch:
-	* gas/mips/elf_arch_mips32r6.d: New file.
-	* gas/mips/elf_arch_mips64r6.d: New file.
-	* gas/mips/mips.exp: Run the new tests.
+	PR gas/17598
+	* gas/i386/reloc64.s: Add @gotplt check.
+	* gas/i386/reloc64.d: Updated.
+	* gas/i386/reloc64.l: Likewise.
 
 2014-11-07  H.J. Lu  <hongjiu.lu@intel.com>
 
-	Apply trunk patch:
-	2014-11-07  H.J. Lu  <hongjiu.lu@intel.com>
-
 	PR ld/17482
 	* gas/i386/ilp32/x32-tls.d: New file.
 	* gas/i386/ilp32/x32-tls.s: Likewise.
 
-2014-10-28  Matthew Fortune  <matthew.fortune@imgtec.com>
+2014-05-11  Matthew Fortune  <matthew.fortune@imgtec.com>
+
+	* gas/mips/elf_arch_mips32r6.d: New file.
+	* gas/mips/elf_arch_mips64r6.d: New file.
+	* gas/mips/mips.exp: Run the new tests.
+
+2014-10-31  Andrew Pinski  <apinski@cavium.com>
+            Naveen H.S  <Naveen.Hurugalawadi@caviumnetworks.com>
+
+	* gas/mips/mips.exp: Add support for Octeon3 architecture.
+	Also add in support for running Octeon3 tests.
+	* gas/mips/octeon3.d: New test.
+	* gas/mips/octeon3.s: New test source.
+
+2014-10-21  Maciej W. Rozycki  <macro@codesourcery.com>
 
-	Apply trunk patches
-	2014-10-21  Maciej W. Rozycki  <macro@codesourcery.com>
 	* gas/mips/insn-opts.d: New test.
 	* gas/mips/insn-opts.s: New test source.
 	* gas/mips/mips.exp: Run the new test.
 
-2014-10-28  Alan Modra  <amodra@gmail.com>
+2014-10-21  Jan Beulich  <jbeulich@suse.com>
+
+	* gas/gas/all/cond.s: Also test processing of leading double
+	quote and trailing backslash in false branch of conditional.
+	* gas/gas/all/cond.l: Adjust accordingly.
+
+2014-10-21  Jan Beulich  <jbeulich@suse.com>
 
-	Apply truck patches
-	2014-10-21  Jan Beulich  <jbeulich@suse.com>
 	* gas/ppc/power8.s: Test msgclr and msgsnd.
 	* gas/ppc/power8.d: Adjust accordingly.
 
-	2014-10-18  Alan Modra  <amodra@gmail.com>
+2014-10-18  Alan Modra  <amodra@gmail.com>
+
 	* gas/i386/inval-equ-2.l: Adjust.
 
 2014-10-09  Jose E. Marchesi  <jose.marchesi@oracle.com>
diff --git a/binutils-2.25/gas/testsuite/gas/aarch64/mapmisc.d b/binutils-2.25/gas/testsuite/gas/aarch64/mapmisc.d
index 0822c5a..adc4e34 100644
--- a/binutils-2.25/gas/testsuite/gas/aarch64/mapmisc.d
+++ b/binutils-2.25/gas/testsuite/gas/aarch64/mapmisc.d
@@ -1,4 +1,4 @@
-#as: -EL -I$srcdir/$subdir 
+#as: -EL -I$srcdir/$subdir --allow-incbin
 #objdump: --syms --special-syms -d
 #name: AArch64 Mapping Symbols for miscellaneous directives
 #source: mapmisc.s
diff --git a/binutils-2.25/gas/testsuite/gas/all/cond.l b/binutils-2.25/gas/testsuite/gas/all/cond.l
index 36f0066..af80a10 100644
--- a/binutils-2.25/gas/testsuite/gas/all/cond.l
+++ b/binutils-2.25/gas/testsuite/gas/all/cond.l
@@ -67,5 +67,8 @@
 [ 	]*[1-9][0-9]*[ 	]+[0-9a-f]+[048c] 0[0C] ?00 ?00 ?0[0C][ 	]+m[ 	]+12,[ 	]*13[ 	]*
 [ 	]*[1-9][0-9]*[ 	]+0[0D] ?00 ?00 ?0[0D][ 	]*
 [ 	]*[1-9][0-9]*[ 	]+
+[ 	]*[1-9][0-9]*[ 	]+\.if[ 	]+0[ 	]*
+[ 	]*[1-9][0-9]*[ 	]+\.endif[ 	]*
+[ 	]*[1-9][0-9]*[ 	]+
 [ 	]*[1-9][0-9]*[ 	]+.*\.p2align 5,0
 #pass
diff --git a/binutils-2.25/gas/testsuite/gas/all/cond.s b/binutils-2.25/gas/testsuite/gas/all/cond.s
index 164e055..f0bf67a 100644
--- a/binutils-2.25/gas/testsuite/gas/all/cond.s
+++ b/binutils-2.25/gas/testsuite/gas/all/cond.s
@@ -89,4 +89,15 @@
 	m	11,
 	m	12, 13
 
+	.if 0
+#define x "m" \
+	(x)
+#define y \
+	"m" \
+	(y)
+#define z \
+	((z) \
+	 + 1)
+	.endif
+
 	.p2align 5,0
diff --git a/binutils-2.25/gas/testsuite/gas/all/incbin.d b/binutils-2.25/gas/testsuite/gas/all/incbin.d
index 6505dc5..04b863a 100644
--- a/binutils-2.25/gas/testsuite/gas/all/incbin.d
+++ b/binutils-2.25/gas/testsuite/gas/all/incbin.d
@@ -1,4 +1,4 @@
-#as: -I$srcdir/$subdir
+#as: -I$srcdir/$subdir --allow-incbin
 #objdump: -s -j .text
 #name: incbin
 #not-target: m32c-*
diff --git a/binutils-2.25/gas/testsuite/gas/epiphany/sample.s b/binutils-2.25/gas/testsuite/gas/epiphany/sample.s
index 91f3940..91f3940 100755..100644
--- a/binutils-2.25/gas/testsuite/gas/epiphany/sample.s
+++ b/binutils-2.25/gas/testsuite/gas/epiphany/sample.s
diff --git a/binutils-2.25/gas/testsuite/gas/i386/reloc64.d b/binutils-2.25/gas/testsuite/gas/i386/reloc64.d
index 4491982..ea7f696 100644
--- a/binutils-2.25/gas/testsuite/gas/i386/reloc64.d
+++ b/binutils-2.25/gas/testsuite/gas/i386/reloc64.d
@@ -50,6 +50,7 @@ Disassembly of section \.text:
 .*[ 	]+R_X86_64_TPOFF32[ 	]+xtrn
 .*[ 	]+R_X86_64_TPOFF32[ 	]+xtrn
 .*[ 	]+R_X86_64_TPOFF32[ 	]+xtrn
+.*[ 	]+R_X86_64_GOTPLT64[ 	]+xtrn
 Disassembly of section \.data:
 #...
 .*[ 	]+R_X86_64_64[ 	]+xtrn
@@ -89,3 +90,4 @@ Disassembly of section \.data:
 .*[ 	]+R_X86_64_PC8[ 	]+xtrn
 .*[ 	]+R_X86_64_GOT32[ 	]+xtrn-0x4
 .*[ 	]+R_X86_64_GOT32[ 	]+xtrn\+0x4
+.*[ 	]+R_X86_64_GOTPLT64[ 	]+xtrn
diff --git a/binutils-2.25/gas/testsuite/gas/i386/reloc64.l b/binutils-2.25/gas/testsuite/gas/i386/reloc64.l
index ded5cab..5e970cb 100644
--- a/binutils-2.25/gas/testsuite/gas/i386/reloc64.l
+++ b/binutils-2.25/gas/testsuite/gas/i386/reloc64.l
@@ -71,3 +71,13 @@
 .*:195: Error: .*
 .*:196: Error: .*
 .*:197: Error: .*
+.*:208: Error: .*
+.*:209: Error: .*
+.*:210: Error: .*
+.*:211: Error: .*
+.*:212: Error: .*
+.*:213: Error: .*
+.*:214: Error: .*
+.*:218: Error: .*
+.*:219: Error: .*
+.*:220: Error: .*
diff --git a/binutils-2.25/gas/testsuite/gas/i386/reloc64.s b/binutils-2.25/gas/testsuite/gas/i386/reloc64.s
index 7b35a02..ecaaef5 100644
--- a/binutils-2.25/gas/testsuite/gas/i386/reloc64.s
+++ b/binutils-2.25/gas/testsuite/gas/i386/reloc64.s
@@ -202,3 +202,19 @@ bad	.byte	xtrn@tpoff
 	.data
 	.long	xtrn@got - 4
 	.long	xtrn@got + 4
+
+	.text
+	movabs	$xtrn@gotplt, %rax
+bad	add	$xtrn@gotplt, %rax
+bad	mov	$xtrn@gotplt, %eax
+bad	mov	$xtrn@gotplt, %ax
+bad	mov	$xtrn@gotplt, %al
+bad	mov	xtrn@gotplt(%rbx), %eax
+bad	mov	xtrn@gotplt(%ebx), %eax
+bad	call	xtrn@gotplt
+
+	.data
+	.quad	xtrn@gotplt
+bad	.long	xtrn@gotplt
+bad	.word	xtrn@gotplt
+bad	.byte	xtrn@gotplt
diff --git a/binutils-2.25/gas/testsuite/gas/i386/x86-64-mpx-branch-1.d b/binutils-2.25/gas/testsuite/gas/i386/x86-64-mpx-branch-1.d
index c070029..5edb1c7 100644
--- a/binutils-2.25/gas/testsuite/gas/i386/x86-64-mpx-branch-1.d
+++ b/binutils-2.25/gas/testsuite/gas/i386/x86-64-mpx-branch-1.d
@@ -8,8 +8,8 @@
 Disassembly of section .text:
 
 0+ <foo1-0xc>:
-[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 6 <foo1-0x6>	2: R_X86_64_PC32	\*ABS\*\+0x10003c
-[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmpq c <foo1>	8: R_X86_64_PC32	\*ABS\*\+0x10003c
+[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 6 <foo1-0x6>	2: R_X86_64_PC32_BND	\*ABS\*\+0x10003c
+[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmpq c <foo1>	8: R_X86_64_PC32_BND	\*ABS\*\+0x10003c
 
 0+c <foo1>:
 [ 	]*[a-f0-9]+:	f2 eb fd             	bnd jmp c <foo1>
@@ -20,9 +20,9 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 24 <foo2>
 
 0+24 <foo2>:
-[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmpq 2a <foo2\+0x6>	26: R_X86_64_PC32	foo-0x4
-[ 	]*[a-f0-9]+:	f2 0f 82 00 00 00 00 	bnd jb 31 <foo2\+0xd>	2d: R_X86_64_PC32	foo-0x4
-[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 37 <foo2\+0x13>	33: R_X86_64_PC32	foo-0x4
-[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmpq 3d <foo2\+0x19>	39: R_X86_64_PLT32	foo-0x4
-[ 	]*[a-f0-9]+:	f2 0f 82 00 00 00 00 	bnd jb 44 <foo2\+0x20>	40: R_X86_64_PLT32	foo-0x4
-[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 4a <foo2\+0x26>	46: R_X86_64_PLT32	foo-0x4
+[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmpq 2a <foo2\+0x6>	26: R_X86_64_PC32_BND	foo-0x4
+[ 	]*[a-f0-9]+:	f2 0f 82 00 00 00 00 	bnd jb 31 <foo2\+0xd>	2d: R_X86_64_PC32_BND	foo-0x4
+[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 37 <foo2\+0x13>	33: R_X86_64_PC32_BND	foo-0x4
+[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmpq 3d <foo2\+0x19>	39: R_X86_64_PLT32_BND	foo-0x4
+[ 	]*[a-f0-9]+:	f2 0f 82 00 00 00 00 	bnd jb 44 <foo2\+0x20>	40: R_X86_64_PLT32_BND	foo-0x4
+[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 4a <foo2\+0x26>	46: R_X86_64_PLT32_BND	foo-0x4
diff --git a/binutils-2.25/gas/testsuite/gas/i386/x86-64-mpx-branch-2.d b/binutils-2.25/gas/testsuite/gas/i386/x86-64-mpx-branch-2.d
index 5bb6a57..86fb360 100644
--- a/binutils-2.25/gas/testsuite/gas/i386/x86-64-mpx-branch-2.d
+++ b/binutils-2.25/gas/testsuite/gas/i386/x86-64-mpx-branch-2.d
@@ -8,8 +8,8 @@
 Disassembly of section .text:
 
 0+ <foo1-0xc>:
-[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 6 <foo1-0x6>	2: R_X86_64_PC32	\*ABS\*\+0x10003c
-[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmpq c <foo1>	8: R_X86_64_PC32	\*ABS\*\+0x10003c
+[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 6 <foo1-0x6>	2: R_X86_64_PC32_BND	\*ABS\*\+0x10003c
+[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmpq c <foo1>	8: R_X86_64_PC32_BND	\*ABS\*\+0x10003c
 
 0+c <foo1>:
 [ 	]*[a-f0-9]+:	f2 eb fd             	bnd jmp c <foo1>
@@ -20,9 +20,9 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 24 <foo2>
 
 0+24 <foo2>:
-[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmpq 2a <foo2\+0x6>	26: R_X86_64_PC32	foo-0x4
-[ 	]*[a-f0-9]+:	f2 0f 82 00 00 00 00 	bnd jb 31 <foo2\+0xd>	2d: R_X86_64_PC32	foo-0x4
-[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 37 <foo2\+0x13>	33: R_X86_64_PC32	foo-0x4
-[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmpq 3d <foo2\+0x19>	39: R_X86_64_PLT32	foo-0x4
-[ 	]*[a-f0-9]+:	f2 0f 82 00 00 00 00 	bnd jb 44 <foo2\+0x20>	40: R_X86_64_PLT32	foo-0x4
-[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 4a <foo2\+0x26>	46: R_X86_64_PLT32	foo-0x4
+[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmpq 2a <foo2\+0x6>	26: R_X86_64_PC32_BND	foo-0x4
+[ 	]*[a-f0-9]+:	f2 0f 82 00 00 00 00 	bnd jb 31 <foo2\+0xd>	2d: R_X86_64_PC32_BND	foo-0x4
+[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 37 <foo2\+0x13>	33: R_X86_64_PC32_BND	foo-0x4
+[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmpq 3d <foo2\+0x19>	39: R_X86_64_PLT32_BND	foo-0x4
+[ 	]*[a-f0-9]+:	f2 0f 82 00 00 00 00 	bnd jb 44 <foo2\+0x20>	40: R_X86_64_PLT32_BND	foo-0x4
+[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 4a <foo2\+0x26>	46: R_X86_64_PLT32_BND	foo-0x4
diff --git a/binutils-2.25/gas/testsuite/gas/mips/mips.exp b/binutils-2.25/gas/testsuite/gas/mips/mips.exp
index fb5d19a..f9fd7c8 100644
--- a/binutils-2.25/gas/testsuite/gas/mips/mips.exp
+++ b/binutils-2.25/gas/testsuite/gas/mips/mips.exp
@@ -495,6 +495,9 @@ mips_arch_create octeonp 64	octeon { oddspreg } \
 mips_arch_create octeon2 64	octeonp { oddspreg } \
 			{ -march=octeon2 -mtune=octeon2 } { -mmips:octeon2 } \
 			{ }
+mips_arch_create octeon3 64	octeon2 { oddspreg } \
+			{ -march=octeon3 -mtune=octeon3 } { -mmips:octeon3 } \
+			{ }
 mips_arch_create xlr 	64	mips64	{ oddspreg } \
 			{ -march=xlr -mtune=xlr } { -mmips:xlr }
 mips_arch_create r5900 	64	mips3	{ gpr_ilocks singlefloat nollsc } \
@@ -1102,6 +1105,7 @@ if { [istarget mips*-*-vxworks*] } {
     run_list_test_arches "octeon-ill"	[mips_arch_list_matching octeon]
     run_dump_test_arches "octeon-pref"	[mips_arch_list_matching octeon]
     run_dump_test_arches "octeon2"	[mips_arch_list_matching octeon2]
+    run_dump_test_arches "octeon3"	[mips_arch_list_matching octeon3]
 
     run_dump_test "smartmips"
     run_dump_test_arches "mips32-dsp"	[mips_arch_list_matching mips32r2 \
diff --git a/binutils-2.25/gas/testsuite/gas/mips/octeon3.d b/binutils-2.25/gas/testsuite/gas/mips/octeon3.d
new file mode 100644
index 0000000..0e0b508
--- /dev/null
+++ b/binutils-2.25/gas/testsuite/gas/mips/octeon3.d
@@ -0,0 +1,20 @@
+#objdump: -d -r --show-raw-insn
+#name: MIPS octeon3 instructions
+
+.*: +file format .*mips.*
+
+Disassembly of section .text:
+
+[0-9a-f]+ <foo>:
+.*:	71ec0008 	mtm0	t3,t0
+.*:	71a40008 	mtm0	t1,a0
+.*:	7083000c 	mtm1	a0,v1
+.*:	70e1000c 	mtm1	a3,at
+.*:	7022000d 	mtm2	at,v0
+.*:	7083000c 	mtm1	a0,v1
+.*:	70a20009 	mtp0	a1,v0
+.*:	70c40009 	mtp0	a2,a0
+.*:	7083000a 	mtp1	a0,v1
+.*:	70e1000a 	mtp1	a3,at
+.*:	7022000b 	mtp2	at,v0
+.*:	7083000a 	mtp1	a0,v1
diff --git a/binutils-2.25/gas/testsuite/gas/mips/octeon3.s b/binutils-2.25/gas/testsuite/gas/mips/octeon3.s
new file mode 100644
index 0000000..f28425c
--- /dev/null
+++ b/binutils-2.25/gas/testsuite/gas/mips/octeon3.s
@@ -0,0 +1,22 @@
+	.text
+	.set noreorder
+	.set noat
+
+foo:
+	mtm0 $15,$12
+	mtm0 $13,$4
+
+	mtm1 $4,$3
+	mtm1 $7,$1
+
+	mtm2 $1,$2
+	mtm1 $4,$3
+
+	mtp0 $5,$2
+	mtp0 $6,$4
+
+	mtp1 $4,$3
+	mtp1 $7,$1
+
+	mtp2 $1,$2
+	mtp1 $4,$3
diff --git a/binutils-2.25/gas/testsuite/gas/pe/pe.exp b/binutils-2.25/gas/testsuite/gas/pe/pe.exp
index 0fab53d..0fab53d 100644..100755
--- a/binutils-2.25/gas/testsuite/gas/pe/pe.exp
+++ b/binutils-2.25/gas/testsuite/gas/pe/pe.exp