*** empty log message ***

From-SVN: r966

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 0a0813ade437cb6fac519122200647ac5bf6a551..2de86ae32eb4a4529425af5f21206b1b297f4d9e 100644 (file)
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -3332,7 +3332,19 @@ mark_addressable (exp)
       case CONST_DECL:
       case PARM_DECL:
       case RESULT_DECL:
-       if (TREE_REGDECL (x) && !TREE_ADDRESSABLE (x))
+       if (TREE_REGDECL (x) && !TREE_ADDRESSABLE (x)
+           && TREE_NONLOCAL (x))
+         {
+           if (TREE_PUBLIC (x))
+             {
+               error ("global register variable `%s' used in nested function",
+                      IDENTIFIER_POINTER (DECL_NAME (x)));
+               return 0;
+             }
+           pedwarn ("register variable `%s' used in nested function",
+                    IDENTIFIER_POINTER (DECL_NAME (x)));
+         }
+       else if (TREE_REGDECL (x) && !TREE_ADDRESSABLE (x))
          {
            if (TREE_PUBLIC (x))
              {