[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

6 files changed, 34 insertions, 3 deletions

diff --git a/binutils-2.25/ld/testsuite/ld-i386/export-class.exp b/binutils-2.25/ld/testsuite/ld-i386/export-class.exp
index 98524a3..7f24a79 100644
--- a/binutils-2.25/ld/testsuite/ld-i386/export-class.exp
+++ b/binutils-2.25/ld/testsuite/ld-i386/export-class.exp
@@ -1,6 +1,6 @@
 # Expect script for symbol export classes, i386 variation.
 #
-# Copyright 2012 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
diff --git a/binutils-2.25/ld/testsuite/ld-i386/i386.exp b/binutils-2.25/ld/testsuite/ld-i386/i386.exp
index 2667381..30be98a 100644
--- a/binutils-2.25/ld/testsuite/ld-i386/i386.exp
+++ b/binutils-2.25/ld/testsuite/ld-i386/i386.exp
@@ -1,6 +1,5 @@
 # Expect script for ld-i386 tests
-#   Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009, 2010, 2012
-#   Free Software Foundation
+#   Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -184,6 +183,14 @@ set i386tests {
     {"TLS IE->LE transition" "-melf_i386" ""
      "--32" {tlsie1.s}
      {{objdump -dwr tlsie1.dd}} "tlsie1"}
+    {"PR ld/17313 (1)" "-melf_i386" ""
+     "--32" {zero.s} {} ""}
+    {"PR ld/17313 (2)" "-melf_i386 -shared --just-symbols=tmpdir/zero.o" ""
+     "--32" {lea1.s} {} "libpr17313.so"}
+    {"PR ld/17306 (1)" "-melf_i386" ""
+     "--32" {pr17306b.s} {} ""}
+    {"PR ld/17306 (2)" "-melf_i386 -shared -Bsymbolic --just-symbols=tmpdir/pr17306b.o" ""
+     "--32" {pr17306a.s} {} "libpr17306.so"}
 }
 
 # So as to avoid rewriting every last test case here in a nacl variant,
@@ -255,3 +262,4 @@ run_dump_test "compressed1"
 run_dump_test "pr12627"
 run_dump_test "pr13302"
 run_dump_test "pr14215"
+run_dump_test "pr17057"
diff --git a/binutils-2.25/ld/testsuite/ld-i386/pr17057.d b/binutils-2.25/ld/testsuite/ld-i386/pr17057.d
new file mode 100644
index 0000000..29cc676
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-i386/pr17057.d
@@ -0,0 +1,9 @@
+#name: PR ld/17057
+#as: --32
+#ld: -shared -melf_i386
+#readelf: -r --wide
+
+Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 2 entries:
+ Offset     Info    Type                Sym. Value  Symbol's Name
+[0-9a-f ]+R_386_JUMP_SLOT +0+ +foo
+[0-9a-f ]+R_386_TLS_DESC +0+ +my_tls
diff --git a/binutils-2.25/ld/testsuite/ld-i386/pr17057.s b/binutils-2.25/ld/testsuite/ld-i386/pr17057.s
new file mode 100644
index 0000000..a4e00ec
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-i386/pr17057.s
@@ -0,0 +1,3 @@
+	.text
+	leal	my_tls@TLSDESC(%ebx), %eax
+	call	foo@PLT
diff --git a/binutils-2.25/ld/testsuite/ld-i386/pr17306a.s b/binutils-2.25/ld/testsuite/ld-i386/pr17306a.s
new file mode 100644
index 0000000..fe2d49c
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-i386/pr17306a.s
@@ -0,0 +1,9 @@
+	.data
+	.globl foo
+foo:
+	.long -1
+	.text
+	.globl	_start
+	.type	_start, @function
+_start:
+	pushl	foo@GOT(%ebx)
diff --git a/binutils-2.25/ld/testsuite/ld-i386/pr17306b.s b/binutils-2.25/ld/testsuite/ld-i386/pr17306b.s
new file mode 100644
index 0000000..2f84e52
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-i386/pr17306b.s
@@ -0,0 +1,2 @@
+	.text
+	movl	foo@GOT(%ebx), %eax