[SCM] master: Merge commit 'gdb/master'

[jkratoch at sourceware dot org]

The branch, master has been updated
       via  44e065f91236a09c27b2df55bc82a39ece67cb83 (commit)
       via  666ed0e9c71be92d765f3d70f418dbddc5c2f27b (commit)
       via  9131277db2fdf786d98d37faacd4b0448eb5a2a8 (commit)
       via  18282ad6ee3efca213ca556eb6a59202e0e13fc1 (commit)
       via  bbbfe99739a7fd40d7d58bfc8c055f87485e8223 (commit)
      from  e13de8a3d58c0f8e1a0057b3942a1f11af2de864 (commit)

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

- Log -----------------------------------------------------------------
commit 44e065f91236a09c27b2df55bc82a39ece67cb83
Merge: e13de8a3d58c0f8e1a0057b3942a1f11af2de864 666ed0e9c71be92d765f3d70f418dbddc5c2f27b
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Mon Nov 9 18:30:47 2009 +0100

    Merge commit 'gdb/master'

commit 666ed0e9c71be92d765f3d70f418dbddc5c2f27b
Author: H.J. Lu <hjl@lucon.org>
Date:   Mon Nov 9 14:37:10 2009 +0000

    Don't return on STT_GNU_IFUNC symbol when stripping.
    
    bfd/
    
    2009-11-09  H.J. Lu  <hongjiu.lu@intel.com>
    
    	PR ld/10911
    	* elflink.c (elf_link_output_extsym): Don't return on
    	STT_GNU_IFUNC symbol when stripping.
    
    ld/testsuite/
    
    2009-11-09  H.J. Lu  <hongjiu.lu@intel.com>
    
    	PR ld/10911
    	* ld-ifunc/ifunc-4a-x86.d: New.

commit 9131277db2fdf786d98d37faacd4b0448eb5a2a8
Author: Tristan Gingold <gingold@adacore.com>
Date:   Mon Nov 9 13:50:29 2009 +0000

    2009-11-09  Tristan Gingold  <gingold@adacore.com>
    
    	* avr/interp.c (sim_resume): Fix typo for OP_ret.

commit 18282ad6ee3efca213ca556eb6a59202e0e13fc1
Author: gdbadmin <gdbadmin@sourceware.org>
Date:   Mon Nov 9 00:00:03 2009 +0000

    *** empty log message ***

commit bbbfe99739a7fd40d7d58bfc8c055f87485e8223
Author: Alan Modra <amodra@bigpond.net.au>
Date:   Sun Nov 8 23:00:04 2009 +0000

    daily update

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

Summary of changes:
 bfd/ChangeLog    |    8 +++++++-
 bfd/elflink.c    |    4 +++-
 bfd/version.h    |    2 +-
 gdb/version.in   |    2 +-
 sim/ChangeLog    |    4 ++++
 sim/avr/interp.c |    2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

First 500 lines of diff:
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e918d6c..03f6773 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/10911
+	* elflink.c (elf_link_output_extsym): Don't return on
+	STT_GNU_IFUNC symbol when stripping.
+
 2009-11-08  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	* elf32-hppa.c (elf32_hppa_final_link): Don't sort unwind information
@@ -8,7 +14,7 @@
 
 	* elflink.c (elf_link_add_object_symbols): Improve error
 	message generated when a symbol is left unresolved because a
-        --no-add-needed command line option has prevented the
+	--no-add-needed command line option has prevented the
 	inclusion of the DSO defining it.
 
 2009-11-03  Alan Modra  <amodra@bigpond.net.au>
diff --git a/bfd/elflink.c b/bfd/elflink.c
index cd016b7..0153411 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -8639,9 +8639,11 @@ elf_link_output_extsym (struct elf_link_hash_entry *h, void *data)
     strip = FALSE;
 
   /* If we're stripping it, and it's not a dynamic symbol, there's
-     nothing else to do unless it is a forced local symbol.  */
+     nothing else to do unless it is a forced local symbol or a
+     STT_GNU_IFUNC symbol.  */
   if (strip
       && h->dynindx == -1
+      && h->type != STT_GNU_IFUNC
       && !h->forced_local)
     return TRUE;
 
diff --git a/bfd/version.h b/bfd/version.h
index 69cb718..f72f46b 100644
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -1,4 +1,4 @@
-#define BFD_VERSION_DATE 20091108
+#define BFD_VERSION_DATE 20091109
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@
diff --git a/gdb/version.in b/gdb/version.in
index 4f1e18b..7636d10 100644
--- a/gdb/version.in
+++ b/gdb/version.in
@@ -1 +1 @@
-7.0.50.20091108-cvs
+7.0.50.20091109-cvs
diff --git a/sim/ChangeLog b/sim/ChangeLog
index 72736f4..6a5e74e 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-09  Tristan Gingold  <gingold@adacore.com>
+
+	* avr/interp.c (sim_resume): Fix typo for OP_ret.
+
 2009-10-23  Doug Evans  <dje@sebabeach.org>
 
 	* cris/arch.c: Regenerate.
diff --git a/sim/avr/interp.c b/sim/avr/interp.c
index 8bb9ec2..903370f 100644
--- a/sim/avr/interp.c
+++ b/sim/avr/interp.c
@@ -985,7 +985,7 @@ sim_resume (SIM_DESC sd, int step, int signal)
 	    unsigned int sp = read_word (REG_SP);
 	    if (avr_pc22)
 	      {
-		pc = sram[++sp] = pc << 16;
+		pc = sram[++sp] << 16;
 		cycles++;
 	      }
 	    else


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