[2.25] sync to a30720e3e633f275250e26f85ccae5dbdddfb6c6

local patches will be re-applied later

commit a30720e3e633f275250e26f85ccae5dbdddfb6c6
Author: Alan Modra <amodra@gmail.com>
Date:   Wed Nov 19 10:30:16 2014 +1030

    daily update

Change-Id: Ieb2a3f4dd2ecb289ac5305ff08d428b2847494ab

5 files changed, 10 insertions, 18 deletions

diff --git a/binutils-2.25/gas/testsuite/gas/bfin/bfin.exp b/binutils-2.25/gas/testsuite/gas/bfin/bfin.exp
index 93f1a3d6..c771923f 100644
--- a/binutils-2.25/gas/testsuite/gas/bfin/bfin.exp
+++ b/binutils-2.25/gas/testsuite/gas/bfin/bfin.exp
@@ -1,5 +1,4 @@
-# Copyright 2012
-# Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/binutils-2.25/gas/testsuite/gas/bfin/error.exp b/binutils-2.25/gas/testsuite/gas/bfin/error.exp
index a0a0331c..be5995ea 100644
--- a/binutils-2.25/gas/testsuite/gas/bfin/error.exp
+++ b/binutils-2.25/gas/testsuite/gas/bfin/error.exp
@@ -1,5 +1,4 @@
-# Copyright 2012
-# Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/binutils-2.25/gas/testsuite/gas/bfin/load.d b/binutils-2.25/gas/testsuite/gas/bfin/load.d
index 5d03d8cd..29931283 100644
--- a/binutils-2.25/gas/testsuite/gas/bfin/load.d
+++ b/binutils-2.25/gas/testsuite/gas/bfin/load.d
@@ -31,7 +31,7 @@ Disassembly of section .text:
   54:	36 e1 ff 7f 	M2 = 0x7fff \(X\);.*
   58:	81 60       	R1 = 0x10 \(X\);.*
   5a:	3c e1 00 00 	L0 = 0x0 \(X\);.*
-  5e:	27 e1 f3 00 	R7 = 0xf3 \(X\);.*
+  5e:	27 e1 01 00 	R7 = 0x1 \(X\);.*
   62:	00 e1 03 00 	R0.L = 0x3;.*
   66:	01 e1 0f 00 	R1.L = 0xf;.*
 
@@ -106,11 +106,4 @@ Disassembly of section .text:
   e8:	fb 98       	R3 = B\[FP--\] \(X\);
   ea:	b7 e5 00 00 	R7 = B\[SP \+ 0x0\] \(X\);
   ee:	be e5 01 80 	R6 = B\[FP \+ -0x7fff\] \(X\);
-
-000000f2 <load_data1>:
-	...
-
-000000f3 <load_data2>:
-  f3:	10 00       	IF !CC JUMP 0xf3 <load_data2>;
-  f5:	00 00       	NOP;
-	...
+	\.\.\.
diff --git a/binutils-2.25/gas/testsuite/gas/bfin/load.s b/binutils-2.25/gas/testsuite/gas/bfin/load.s
index 96ae1faa..0b785259 100644
--- a/binutils-2.25/gas/testsuite/gas/bfin/load.s
+++ b/binutils-2.25/gas/testsuite/gas/bfin/load.s
@@ -129,6 +129,7 @@ load_byte_sign_extend:
 	r7 = B [ sp+0] (x);
 	r6 = b [fp-0x7fff] (X);
 
+	.data
 	.global load_data
 load_data1:	.byte 0
 load_data2:	.word 16
diff --git a/binutils-2.25/gas/testsuite/gas/bfin/parallel_illegal.d b/binutils-2.25/gas/testsuite/gas/bfin/parallel_illegal.d
index 1f75a18e..b896c4d4 100644
--- a/binutils-2.25/gas/testsuite/gas/bfin/parallel_illegal.d
+++ b/binutils-2.25/gas/testsuite/gas/bfin/parallel_illegal.d
@@ -8,23 +8,23 @@ Disassembly of section .text:
    0:	03 c8 00 18 	MNOP || NOP || NOP;
    4:	00 00 00 00 
    8:	03 c8       	MNOP || ILLEGAL || NOP;.*
-   a:	00 18       	IF CC JUMP 0x0xa
+   a:	00 18       	IF CC JUMP 0x0xa;
    c:	01 00       	ILLEGAL;
    e:	00 00       	NOP;
   10:	03 c8       	MNOP || NOP || ILLEGAL;.*
-  12:	00 18       	IF CC JUMP 0x0x12
+  12:	00 18       	IF CC JUMP 0x0x12;
   14:	00 00       	NOP;
   16:	01 00       	ILLEGAL;
   18:	03 c8       	MNOP || ILLEGAL || ILLEGAL;.*
-  1a:	00 18       	IF CC JUMP 0x0x1a
+  1a:	00 18       	IF CC JUMP 0x0x1a;
   1c:	01 00       	ILLEGAL;
   1e:	01 00       	ILLEGAL;
   20:	03 c8       	MNOP || ILLEGAL || ILLEGAL;.*
-  22:	00 18       	IF CC JUMP 0x0x22
+  22:	00 18       	IF CC JUMP 0x0x22;
   24:	10 00       	RTS;
   26:	10 00       	RTS;
   28:	03 c8       	MNOP || ILLEGAL || ILLEGAL;.*
-  2a:	00 18       	IF CC JUMP 0x0x2a
+  2a:	00 18       	IF CC JUMP 0x0x2a;
   2c:	03 c0 00 18 	MNOP;
   30:	00 00       	NOP;
 	...