Enlist the FreeBSD-CURRENT users as testers of what is to become Gcc 3.1.0.

These bits are taken from the FSF anoncvs repo on 1-Feb-2002 08:20 PST.

1 files changed, 27 insertions, 71 deletions

diff --git a/contrib/gcc/c-pragma.h b/contrib/gcc/c-pragma.h
index f94ee9f..ff00f32 100644
--- a/contrib/gcc/c-pragma.h
+++ b/contrib/gcc/c-pragma.h
@@ -1,30 +1,31 @@
 /* Pragma related interfaces.
-   Copyright (C) 1995, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002
+   Free Software Foundation, Inc.
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
 
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GCC; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.  */
 
-#ifndef _C_PRAGMA_H
-#define _C_PRAGMA_H
+#ifndef GCC_C_PRAGMA_H
+#define GCC_C_PRAGMA_H
 
 #ifdef HANDLE_SYSV_PRAGMA
-/* Support #pragma weak iff ASM_WEAKEN_LABEL and ASM_OUTPUT_DEF are
+/* Support #pragma weak iff ASM_WEAKEN_LABEL and ASM_OUTPUT_WEAK_ALIAS are
    defined.  */
-#if defined (ASM_WEAKEN_LABEL) && defined (ASM_OUTPUT_DEF)
+#if defined (ASM_WEAKEN_LABEL) && defined (ASM_OUTPUT_WEAK_ALIAS)
 #define HANDLE_PRAGMA_WEAK SUPPORTS_WEAK
 #endif
 
@@ -39,63 +40,18 @@ Boston, MA 02111-1307, USA.  */
 /* If we are supporting #pragma pack(push... then we automatically
    support #pragma pack(<n>)  */
 #define HANDLE_PRAGMA_PACK 1
-#define PRAGMA_INSERT_ATTRIBUTES(node, pattr, prefix_attr) \
-  insert_pack_attributes (node, pattr, prefix_attr)
-extern void insert_pack_attributes PROTO((tree, tree *, tree *));
 #endif /* HANDLE_PRAGMA_PACK_PUSH_POP */
 
+extern void init_pragma PARAMS ((void));
 
-#ifdef HANDLE_PRAGMA_WEAK
-/* This structure contains any weak symbol declarations waiting to be emitted.  */
-struct weak_syms
-{
-  struct weak_syms * next;
-  char * name;
-  char * value;
-};
+/* Duplicate prototypes for the register_pragma stuff and the typedef for
+   cpp_reader, to avoid dragging cpplib.h in almost everywhere...  */
+#ifndef GCC_CPPLIB_H
+typedef struct cpp_reader cpp_reader;
 
-/* Declared in varasm.c */
-extern struct weak_syms * weak_decls;
-
-extern int add_weak PROTO((char *, char *));
-#endif /* HANDLE_PRAGMA_WEAK */
-
-
-#if defined HANDLE_PRAGMA_PACK || defined HANDLE_PRAGMA_WEAK
-/* Define HANDLE_GENERIC_PRAGMAS if any kind of front-end pragma
-   parsing is to be done.  The code in GCC's generic C source files
-   will only look for the definition of this constant.  They will
-   ignore definitions of HANDLE_PRAGMA_PACK and so on.  */
-#define HANDLE_GENERIC_PRAGMAS 1
-#endif
-
-
-#ifdef HANDLE_GENERIC_PRAGMAS
-enum pragma_state
-{
-  ps_start,
-  ps_done,
-#ifdef HANDLE_PRAGMA_WEAK
-  ps_weak,
-  ps_name,
-  ps_equals,
-  ps_value,
-#endif
-#ifdef HANDLE_PRAGMA_PACK
-  ps_pack,
-  ps_left,
-  ps_align,
-  ps_right,
+extern void cpp_register_pragma PARAMS ((cpp_reader *,
+					 const char *, const char *,
+					 void (*) PARAMS ((cpp_reader *))));
 #endif
-#ifdef HANDLE_PRAGMA_PACK_PUSH_POP
-  ps_push, ps_pushcomma, ps_pushid, ps_pushcomma2,
-  ps_pop, ps_popcomma,
-#endif
-  ps_bad
-};
-
-/* Handle a C style pragma */
-extern int handle_pragma_token PROTO((const char *, tree));
 
-#endif /* HANDLE_GENERIC_PRAGMAS */
-#endif /* _C_PRAGMA_H */
+#endif /* GCC_C_PRAGMA_H */