[SCM] archer-jankratochvil-autoload: Merge branch 'secmove-misc2-warn-safepath-debug' into secmove-misc2-warn-safepath-debug-warnlocal

[jkratoch@sourceware.org]

The branch, archer-jankratochvil-autoload has been updated
       via  204376e6b7f72da164f7db49480fcad7f69fc78e (commit)
       via  e30d8fbe4d07f96752382d95b4c5ecc8d7da4b3d (commit)
       via  01fb059ea068b42852d6faa4ff6a3c106a1d1e69 (commit)
       via  90c5527fbd752ced36a482bc1515a7a7bbb502a3 (commit)
       via  fd86fa17025ab1370f908cd3aae28e760dc490ea (commit)
       via  d651fc3d57f199a8b13433a8ab93ffb13ecedcdc (commit)
       via  856b6d33858f363c9f7b4f1276ffc1c35f336cf7 (commit)
       via  b878b3dd27664f3c1aea39f6bc5173c6054a0b4b (commit)
       via  b8ccb946064deec565e9649fb1eba34817f5fded (commit)
      from  736b9ee51145c64688d9f3dac2543c1e8272f08f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 204376e6b7f72da164f7db49480fcad7f69fc78e
Merge: 736b9ee e30d8fb
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Mar 20 20:39:01 2012 +0100

    Merge branch 'secmove-misc2-warn-safepath-debug' into secmove-misc2-warn-safepath-debug-warnlocal

commit e30d8fbe4d07f96752382d95b4c5ecc8d7da4b3d
Merge: bdc6007 01fb059
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Mar 20 20:39:01 2012 +0100

    Merge branch 'secmove-misc2-warn-safepath' into secmove-misc2-warn-safepath-debug

commit 01fb059ea068b42852d6faa4ff6a3c106a1d1e69
Merge: d23d429 90c5527
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Mar 20 20:39:00 2012 +0100

    Merge branch 'secmove-misc2-warn' into secmove-misc2-warn-safepath

commit 90c5527fbd752ced36a482bc1515a7a7bbb502a3
Merge: 482eed1 fd86fa1
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Mar 20 20:39:00 2012 +0100

    Merge branch 'secmove-misc2' into secmove-misc2-warn

commit fd86fa17025ab1370f908cd3aae28e760dc490ea
Merge: 2289e5b d651fc3
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Mar 20 20:39:00 2012 +0100

    Merge branch 'secmove' into secmove-misc2

commit d651fc3d57f199a8b13433a8ab93ffb13ecedcdc
Merge: e9c2841 856b6d3
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Mar 20 20:39:00 2012 +0100

    Merge remote-tracking branch 'gdb/master' into secmove

commit 856b6d33858f363c9f7b4f1276ffc1c35f336cf7
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Tue Mar 20 18:16:28 2012 +0000

    Handle relocation against protected function for -Bsymbolic
    
    bfd/
    
    2012-03-20  H.J. Lu  <hongjiu.lu@intel.com>
    
    	PR ld/13880
    	* elf32-i386.c (elf_i386_relocate_section): Don't issue an error
    	for R_386_GOTOFF relocation against protected function if
    	SYMBOLIC_BIND is true.
    
    	* elf64-x86-64.c (elf_x86_64_relocate_section): Don't issue an
    	error for R_X86_64_GOTOFF64 relocation against protected function
    	when building executable or SYMBOLIC_BIND is true.
    
    ld/testsuite/
    
    2012-03-20  H.J. Lu  <hongjiu.lu@intel.com>
    
    	PR ld/13880
    	* ld-i386/i386.exp: Run protected4 and protected5.
    	* ld-x86-64/x86-64.exp: Likewise.
    
    	* ld-i386/protected4.d: New.
    	* ld-i386/protected4.s: Likewise.
    	* ld-i386/protected5.d: Likewise.
    	* ld-i386/protected5.s: Likewise.
    	* ld-x86-64/protected4.d: Likewise.
    	* ld-x86-64/protected4.s: Likewise.
    	* ld-x86-64/protected5.d: Likewise.
    	* ld-x86-64/protected5.s: Likewise.

commit b878b3dd27664f3c1aea39f6bc5173c6054a0b4b
Author: Pedro Alves <pedro@codesourcery.com>
Date:   Tue Mar 20 18:14:12 2012 +0000

    2012-03-20  Pedro Alves  <palves@redhat.com>
    
    	* remote.c (remote_start_remote): Clear `rs->starting_up' on early
    	returns.

commit b8ccb946064deec565e9649fb1eba34817f5fded
Author: qiyao <qiyao>
Date:   Tue Mar 20 07:08:52 2012 +0000

    gdb/
    	* amd64-tdep.c (amd64_displaced_step_copy_insn): Complete missing "}" in
    	comment.

-----------------------------------------------------------------------

Summary of changes:
 bfd/ChangeLog      |   11 +++++++++++
 bfd/elf32-i386.c   |    1 +
 bfd/elf64-x86-64.c |    3 ++-
 gdb/ChangeLog      |   10 ++++++++++
 gdb/amd64-tdep.c   |    2 +-
 gdb/remote.c       |    2 ++
 6 files changed, 27 insertions(+), 2 deletions(-)

First 500 lines of diff:
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b9849f8..735a0ba 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,14 @@
+2012-03-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13880
+	* elf32-i386.c (elf_i386_relocate_section): Don't issue an error
+	for R_386_GOTOFF relocation against protected function if
+	SYMBOLIC_BIND is true.
+
+	* elf64-x86-64.c (elf_x86_64_relocate_section): Don't issue an
+	error for R_X86_64_GOTOFF64 relocation against protected function
+	when building executable or SYMBOLIC_BIND is true.
+
 2012-03-16  Roland McGrath  <mcgrathr@google.com>
 
 	* config.bfd: Handle x86_64-*-nacl*.
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 4ae2166..f35e3c2 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -3503,6 +3503,7 @@ elf_i386_relocate_section (bfd *output_bfd,
 		  return FALSE;
 		}
 	      else if (!info->executable
+		       && !SYMBOLIC_BIND (info, h)
 		       && h->type == STT_FUNC
 		       && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
 		{
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index f2f803a..cc5ee42 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -3464,8 +3464,9 @@ elf_x86_64_relocate_section (bfd *output_bfd,
 	  /* Check to make sure it isn't a protected function symbol
 	     for shared library since it may not be local when used
 	     as function address.  */
-	  if (info->shared
+	  if (!info->executable
 	      && h
+	      && !SYMBOLIC_BIND (info, h)
 	      && h->def_regular
 	      && h->type == STT_FUNC
 	      && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aad141b..d18163e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-20  Pedro Alves  <palves@redhat.com>
+
+	* remote.c (remote_start_remote): Clear `rs->starting_up' on early
+	returns.
+
+2012-03-20  Yao Qi  <yao@codesourcery.com>
+
+	* amd64-tdep.c (amd64_displaced_step_copy_insn): Complete missing "}" in
+	comment.
+
 2012-03-19  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Code cleanupp: Use cu_offset and sect_offset compile time type checking.
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index ea65d0d..a193099 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -1258,7 +1258,7 @@ amd64_displaced_step_copy_insn (struct gdbarch *gdbarch,
 				struct regcache *regs)
 {
   int len = gdbarch_max_insn_length (gdbarch);
-  /* Extra space for sentinels so fixup_{riprel,displaced_copy don't have to
+  /* Extra space for sentinels so fixup_{riprel,displaced_copy} don't have to
      continually watch for running off the end of the buffer.  */
   int fixup_sentinel_space = len;
   struct displaced_step_closure *dsc =
diff --git a/gdb/remote.c b/gdb/remote.c
index c246067..caf6116 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -3378,6 +3378,7 @@ remote_start_remote (int from_tty, struct target_ops *target, int extended_p)
 
 	  /* We're connected, but not running.  Drop out before we
 	     call start_remote.  */
+	  rs->starting_up = 0;
 	  return;
 	}
       else
@@ -3469,6 +3470,7 @@ remote_start_remote (int from_tty, struct target_ops *target, int extended_p)
 
 	  /* We're connected, but not running.  Drop out before we
 	     call start_remote.  */
+	  rs->starting_up = 0;
 	  return;
 	}
 


hooks/post-receive
--
Repository for Project Archer.