[src/trunk]: src Pull across the fix for target/50691

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d885b2eda347
branches:  trunk
changeset: 771735:d885b2eda347
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Dec 02 09:44:48 2011 +0000

description:
Pull across the fix for target/50691

ok'ed by mrg@

diffstat:

 external/gpl3/gcc/dist/gcc/ChangeLog      |  7 +++++++
 external/gpl3/gcc/dist/gcc/config/pa/pa.c |  5 +++++
 external/gpl3/gcc/dist/gcc/config/pa/pa.h |  3 +++
 tools/gcc/Makefile                        |  4 ++--
 4 files changed, 17 insertions(+), 2 deletions(-)

diffs (60 lines):

diff -r 76a84de9b511 -r d885b2eda347 external/gpl3/gcc/dist/gcc/ChangeLog
--- a/external/gpl3/gcc/dist/gcc/ChangeLog      Fri Dec 02 09:40:18 2011 +0000
+++ b/external/gpl3/gcc/dist/gcc/ChangeLog      Fri Dec 02 09:44:48 2011 +0000
@@ -1,3 +1,10 @@
+2011-10-29  John David Anglin  <dave.anglin%nrc-cnrc.gc.ca@localhost>
+
+       PR target/50691
+       * config/pa/pa.c (emit_move_sequence): Legitimize TLS symbol references.
+       * config/pa/pa.h (LEGITIMATE_CONSTANT_P): Return false for
+       TLS_MODEL_GLOBAL_DYNAMIC and TLS_MODEL_LOCAL_DYNAMIC symbol references.
+
 2011-04-28  Release Manager
 
        * GCC 4.5.3 released.
diff -r 76a84de9b511 -r d885b2eda347 external/gpl3/gcc/dist/gcc/config/pa/pa.c
--- a/external/gpl3/gcc/dist/gcc/config/pa/pa.c Fri Dec 02 09:40:18 2011 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/pa/pa.c Fri Dec 02 09:44:48 2011 +0000
@@ -1686,6 +1686,11 @@
   /* Handle the most common case: storing into a register.  */
   else if (register_operand (operand0, mode))
     {
+      /* Legitimize TLS symbol references.  This happens for references
+        that aren't a legitimate constant.  */
+      if (PA_SYMBOL_REF_TLS_P (operand1))
+       operand1 = legitimize_tls_address (operand1);
+
       if (register_operand (operand1, mode)
          || (GET_CODE (operand1) == CONST_INT
              && cint_ok_for_move (INTVAL (operand1)))
diff -r 76a84de9b511 -r d885b2eda347 external/gpl3/gcc/dist/gcc/config/pa/pa.h
--- a/external/gpl3/gcc/dist/gcc/config/pa/pa.h Fri Dec 02 09:40:18 2011 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/pa/pa.h Fri Dec 02 09:44:48 2011 +0000
@@ -891,6 +891,9 @@
    && (NEW_HP_ASSEMBLER                                                \
        || TARGET_GAS                                           \
        || GET_CODE (X) != LABEL_REF)                           \
+   && (!PA_SYMBOL_REF_TLS_P (X)                                        \
+       || (SYMBOL_REF_TLS_MODEL (X) != TLS_MODEL_GLOBAL_DYNAMIC                \
+          && SYMBOL_REF_TLS_MODEL (X) != TLS_MODEL_LOCAL_DYNAMIC))     \
    && (!TARGET_64BIT                                           \
        || GET_CODE (X) != CONST_DOUBLE)                                \
    && (!TARGET_64BIT                                           \
diff -r 76a84de9b511 -r d885b2eda347 tools/gcc/Makefile
--- a/tools/gcc/Makefile        Fri Dec 02 09:40:18 2011 +0000
+++ b/tools/gcc/Makefile        Fri Dec 02 09:44:48 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.46 2011/09/26 21:16:14 christos Exp $
+#      $NetBSD: Makefile,v 1.47 2011/12/02 09:44:48 skrll Exp $
 
 .include <bsd.own.mk>
 
@@ -37,7 +37,7 @@
                        --enable-long-long \
                        --enable-threads \
                        --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html \
-                       --with-pkgversion="NetBSD nb1 20110620" \
+                       --with-pkgversion="NetBSD nb2 20111202" \
                        ${VAX_CONFIGURE_ARGS} \
                        --enable-__cxa_atexit
 .if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH})