From d218e1127b7456d4e6d063ef281ad78e86d978af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20Sp=C3=B6rlein?= <uqs@FreeBSD.org>
Date: Fri, 1 Jul 2011 20:45:55 +0000
Subject: [PATCH] - Fix typo in check_for_nested_with_variably_modified present
 - Implement -Wvariable-decl. - Port -Wtrampolines support from gcc3. (all
 three also via OpenBSD)

PR:		gnu/127136, gnu/157019
Submitted by:	Henning Petersen, Pedro Giffuni
MFC after:	6 weeks
---
 contrib/gcc/c-decl.c      | 2 ++
 contrib/gcc/c.opt         | 4 ++++
 contrib/gcc/common.opt    | 4 ++++
 contrib/gcc/tree-nested.c | 6 +++++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/contrib/gcc/c-decl.c b/contrib/gcc/c-decl.c
index 64a6fa8fb85..fbafc0dbdc9 100644
--- a/contrib/gcc/c-decl.c
+++ b/contrib/gcc/c-decl.c
@@ -4340,6 +4340,8 @@ grokdeclarator (const struct c_declarator *declarator,
 			  pedwarn ("ISO C90 forbids variable-size array %qs",
 				   name);
 		      }
+		    if (warn_variable_decl)
+		      warning (0, "variable-sized array %qs", name);
 		  }
 
 		if (integer_zerop (size))
diff --git a/contrib/gcc/c.opt b/contrib/gcc/c.opt
index 87696575409..038fc51d88b 100644
--- a/contrib/gcc/c.opt
+++ b/contrib/gcc/c.opt
@@ -404,6 +404,10 @@ Wtraditional
 C ObjC Var(warn_traditional)
 Warn about features not present in traditional C
 
+Wtrampolines
+Common Var(warn_trampolines)
+Warn when trampolines are emitted
+
 Wtrigraphs
 C ObjC C++ ObjC++
 Warn if trigraphs are encountered that might affect the meaning of the program
diff --git a/contrib/gcc/common.opt b/contrib/gcc/common.opt
index 367e5403bb2..2270d0d8e99 100644
--- a/contrib/gcc/common.opt
+++ b/contrib/gcc/common.opt
@@ -189,6 +189,10 @@ Wunused-variable
 Common Var(warn_unused_variable)
 Warn when a variable is unused
 
+Wvariable-decl
+Common Var(warn_variable_decl)
+Warn about variable-sized declarations.
+
 Wvolatile-register-var
 Common Var(warn_register_var)
 Warn when a register variable is declared volatile
diff --git a/contrib/gcc/tree-nested.c b/contrib/gcc/tree-nested.c
index 06fbbc99e6b..9efcd98f014 100644
--- a/contrib/gcc/tree-nested.c
+++ b/contrib/gcc/tree-nested.c
@@ -750,7 +750,7 @@ check_for_nested_with_variably_modified (tree fndecl, tree orig_fndecl)
   for (cgn = cgn->nested; cgn ; cgn = cgn->next_nested)
     {
       for (arg = DECL_ARGUMENTS (cgn->decl); arg; arg = TREE_CHAIN (arg))
-	if (variably_modified_type_p (TREE_TYPE (arg), 0), orig_fndecl)
+	if (variably_modified_type_p (TREE_TYPE (arg), orig_fndecl))
 	  return true;
 
       if (check_for_nested_with_variably_modified (cgn->decl, orig_fndecl))
@@ -1621,6 +1621,10 @@ convert_tramp_reference (tree *tp, int *walk_subtrees, void *data)
 	 it doesn't need a trampoline.  */
       if (DECL_NO_STATIC_CHAIN (decl))
 	break;
+      if (warn_trampolines)
+	{
+	warning(0, "local function address taken needing trampoline generation");
+	}
 
       /* Lookup the immediate parent of the callee, as that's where
 	 we need to insert the trampoline.  */