From 89176bdba499d601cde11896100c111695e19118 Mon Sep 17 00:00:00 2001
From: nickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 17 Nov 2003 08:42:59 +0000
Subject: [PATCH] Replace use of poisoned BUILD_VA_LIST_TYPE macro with a
 target function.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73666 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog                         | 9 +++++++++
 gcc/config/stormy16/stormy16-protos.h | 1 -
 gcc/config/stormy16/stormy16.c        | 7 +++++--
 gcc/config/stormy16/stormy16.h        | 5 -----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5b35017e1bb..be235d9c818 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-16  Nick Clifton  <nickc@redhat.com>
+
+	* config/stormy16/stormy16.h (BUILD_VA_LIST_TYPE): Delete.
+	* config/stormy16/stormy16-protos.h (xstormy16_build_va_list):
+	Remove prototype.
+	* config/stormy16/stormy16.c (xstormy16_build_va_list): Rename
+	to xstormy16_build_builtin_va_list and make static.
+        (TARGET_BUILD_BUILTIN_VA_LIST): Define.
+
 2003-11-16  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* config/h8300/h8300-protos.h: Add the prototype for
diff --git a/gcc/config/stormy16/stormy16-protos.h b/gcc/config/stormy16/stormy16-protos.h
index 70e63633855..ac47238fbc8 100644
--- a/gcc/config/stormy16/stormy16-protos.h
+++ b/gcc/config/stormy16/stormy16-protos.h
@@ -39,7 +39,6 @@ extern rtx xstormy16_function_arg
 #  endif
 extern void xstormy16_setup_incoming_varargs 
  (CUMULATIVE_ARGS, int, tree, int *);
-extern tree xstormy16_build_va_list (void);
 #endif
 
 #if defined (TREE_CODE) && defined (RTX_CODE)
diff --git a/gcc/config/stormy16/stormy16.c b/gcc/config/stormy16/stormy16.c
index 1961f0a9d01..de60b0005f5 100644
--- a/gcc/config/stormy16/stormy16.c
+++ b/gcc/config/stormy16/stormy16.c
@@ -1251,8 +1251,8 @@ xstormy16_setup_incoming_varargs (CUMULATIVE_ARGS cum ATTRIBUTE_UNUSED,
    for arguments that have not been passed in registers.  
    To keep the layout nice, the pointer is first in the structure.  */
 
-tree
-xstormy16_build_va_list (void)
+static tree
+xstormy16_build_builtin_va_list (void)
 {
   tree f_1, f_2, record, type_decl;
 
@@ -2211,4 +2211,7 @@ xstormy16_expand_builtin(tree exp, rtx target,
 #undef TARGET_ADDRESS_COST
 #define TARGET_ADDRESS_COST xstormy16_address_cost
 
+#undef TARGET_BUILD_BUILTIN_VA_LIST_TYPE
+#define TARGET_BUILD_BUILTIN_VA_LIST_TYPE xstormy16_build_builtin_va_list
+
 struct gcc_target targetm = TARGET_INITIALIZER;
diff --git a/gcc/config/stormy16/stormy16.h b/gcc/config/stormy16/stormy16.h
index 3d1ab50756f..088c7eb5cea 100644
--- a/gcc/config/stormy16/stormy16.h
+++ b/gcc/config/stormy16/stormy16.h
@@ -496,11 +496,6 @@ enum reg_class
   if (! SECOND_TIME) \
     xstormy16_setup_incoming_varargs (ARGS_SO_FAR, MODE, TYPE, & PRETEND_ARGS_SIZE)
 
-/* Build up the stdarg/varargs va_list type tree, assigning it to NODE.  If not
-   defined, it is assumed that va_list is a void * pointer.  */
-#define BUILD_VA_LIST_TYPE(NODE) \
-  ((NODE) = xstormy16_build_va_list ())
-
 /* Implement the stdarg/varargs va_start macro.  STDARG_P is nonzero if this
    is stdarg.h instead of varargs.h.  VALIST is the tree of the va_list
    variable to initialize.  NEXTARG is the machine independent notion of the
-- 
2.11.4.GIT