merge with gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 92d011eb438669757a9d37505a11143183d17276..97b1899e29c1c8bb622159e31bc3ace7960d2812 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -14,6 +14,21 @@
 
        * coff/pe.h: clarify a comment
 
+2000-06-21  Alex Samuel  <samuel@codesourcery.com>
+
+       * dyn-string.h (dyn_string_init, dyn_string_new,
+       dyn_string_delete, dyn_string_release, dyn_string_resize,
+       dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
+       dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
+       dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
+       dyn_string_append_char, dyn_string_substring_dyn_string_eq):
+       Define as same name with __cxa_ prepended, if IN_LIBGCC2.
+       (dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
+       dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
+       dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
+       dyn_string_append_char, dyn_string_substring): Change return type
+       to int.
+       
 2000-06-18  Stephane Carrez  <stcarrez@worldnet.fr>
 
        * dis-asm.h (print_insn_m68hc12): Define.
@@ -24,24 +39,24 @@
        * os9k.h: Change values of MODSYNC and CRCCON due to bug report
        from Russ Magee <rmagee@home.com>.
 
-2000-06-17  H.J. Lu  <hjl@gnu.org>
-
-       * getopt.h: Updated from gcc.
-       * libiberty.h: Likewise.
-       * symcat.h: Likewise.
+2000-06-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
-2000-06-17  H.J. Lu  <hjl@gnu.org>
+       * demangle.h (demangling_styles): Remove trailing comma in enum.
 
-       * ansidecl.h: Updated from gcc.
+       * dyn-string.h (dyn_string_append_char): Change parameter from
+       char to int.
 
-2000-06-15  H.J. Lu  <hjl@gnu.org>
+2000-06-04  Alex Samuel  <samuel@codesourcery.com>
 
-       * sort.h: New file. Imported from gcc.
-       * dyn-string.h: Likewise.
-
-       * hashtab.h: Updated from gcc.
-       * demangle.h: Likewise.
+       * dyn-string.h: Move here from gcc/dyn-string.h.  Add new functions.
 
+       * demangle.h (DMGL_GNU_NEW_ABI): New macro.
+       (DMGL_STYLE_MASK): Or in DMGL_GNU_NEW_ABI. 
+       (current_demangling_style): Add gnu_new_abi_demangling.
+       (GNU_NEW_ABI_DEMANGLING_STYLE_STRING): New macro.
+       (GNU_NEW_ABI_DEMANGLING): Likewise.
+       (cplus_demangle_new_abi): New declaration.
+       
 Tue May 30 16:53:34 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
        * floatformat.h (struct floatformat): Add field name.
@@ -52,6 +67,12 @@ Tue May 30 16:53:34 2000  Andrew Cagney  <cagney@b1.cygnus.com>
        (HAVE_DOS_BASED_FILE_SYSTEM, IS_DIR_SEPARATOR)
        (IS_ABSOLUTE_PATH, FILENAME_CMP): New macros.
 
+2000-05-23  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * getopt.h (getopt): Also check HAVE_DECL_* when prototyping.
+
+       * libiberty.h (basename): Likewise.
+
 2000-05-17  S. Bharadwaj Yadavalli  <sby@scrugs.lkg.dec.com>
            Rick Gorton             <gorton@scrugs.lkg.dec.com>
            
@@ -61,19 +82,63 @@ Tue May 30 16:53:34 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
        * dis-asm.h (print_insn_tic54x): Declare.
 
+2000-05-06  Zack Weinberg  <zack@wolery.cumb.org>
+
+       * ansidecl.h: #define __extension__ to nothing if
+       GCC_VERSION < 2008.
+
 Fri May  5 16:51:03 2000  Clinton Popetz  <cpopetz@cygnus.com>
 
        * coff/rs6k64.h (U802TOC64MAGIC): Change to U803XTOCMAGIC.
 
+2000-05-04  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * demangle.h (demangler_engine): Constify.
+
+Thu May  4 17:15:26 2000  Philippe De Muyter  <phdm@macqel.be>
+
+       * sort.h (sys/types.h): File included unconditionnaly.
+       (stddef.h): File include only #ifdef __STDC__.
+
+2000-05-03  Zack Weinberg  <zack@wolery.cumb.org>
+
+       * symcat.h: Remove #endif label.
+
+2000-04-28  Kenneth Block  <block@zk3.dec.com>
+           Jason Merrill  <jason@casey.cygnus.com>
+
+        * demangle.h (libiberty_demanglers): new table for different styles.
+        (cplus_demangle_set_style): New function for setting style.
+        (cplus_demangle_name_to_style): New function to translate name.
+
 Mon Apr 24 15:20:51 2000  Clinton Popetz  <cpopetz@cygnus.com>
 
        * include/coff/rs6k64.h: New file.
 
+2000-04-24  Mark Mitchell  <mark@codesourcery.com>
+
+       * hashtab.h (hash_pointer): Declare.
+       (eq_pointer): Likewise.
+
+2000-04-23  Mark Mitchell  <mark@codesourcery.com>
+
+       * sort.h: New file.
+
 Fri Apr 21 13:20:53 2000  Richard Henderson  <rth@cygnus.com>
                          David Mosberger  <davidm@hpl.hp.com>
 
        * dis-asm.h (print_insn_ia64): Declare.
 
+Tue Apr 18 16:22:30 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
+
+       * hashtab.h (enum insert_option): New type.
+       (htab_find_slot, htab_find_slot_with_hash): Use it.
+
+2000-04-17  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * symcat.h: Honor autoconf macro HAVE_STRINGIZE.  Add
+       comments/caveats with regard to traditional C behavior.
+
 2000-04-05  Richard Henderson  <rth@cygnus.com>
 
        * splay-tree.h (splay_tree_remove): Declare.
@@ -86,6 +151,12 @@ Fri Apr 21 13:20:53 2000  Richard Henderson  <rth@cygnus.com>
 
        * bin-bugs.h: New file.
 
+2000-03-30  Mark Mitchell  <mark@codesourcery.com>
+
+       * hashtab.h (hashval_t): New type.
+       (htab_find_with_hash): Use it as an argument.
+       (htab_find_slot_with_hash): Likewise.
+
 2000-03-27  Denis Chertykov  <denisc@overta.ru>
 
        * dis-asm.h (print_insn_avr): Declare.

diff --git a/include/dyn-string.h b/include/dyn-string.h
index 3e2213e5bc6fc1e0e5e223f6b2e2cbc33157b373..103f9472538f24508c05fdce92c58c1a7e69b946 100644 (file)
--- a/include/dyn-string.h
+++ b/include/dyn-string.h
@@ -40,25 +40,53 @@ typedef struct dyn_string
   (strcmp ((DS1)->s, (DS2)->s))
 
 
-extern void dyn_string_init             PARAMS ((struct dyn_string *, int));
+/* dyn_string functions are used in the demangling implementation
+   included in the G++ runtime library.  To prevent collisions with
+   names in user programs, the functions that are used in the
+   demangler are given implementation-reserved names.  */
+
+#ifdef IN_LIBGCC2
+
+#define dyn_string_init                 __cxa_dyn_string_init
+#define dyn_string_new                  __cxa_dyn_string_new
+#define dyn_string_delete               __cxa_dyn_string_delete
+#define dyn_string_release              __cxa_dyn_string_release
+#define dyn_string_resize               __cxa_dyn_string_resize
+#define dyn_string_clear                __cxa_dyn_string_clear
+#define dyn_string_copy                 __cxa_dyn_string_copy
+#define dyn_string_copy_cstr            __cxa_dyn_string_copy_cstr
+#define dyn_string_prepend              __cxa_dyn_string_prepend
+#define dyn_string_prepend_cstr         __cxa_dyn_string_prepend_cstr
+#define dyn_string_insert               __cxa_dyn_string_insert
+#define dyn_string_insert_cstr          __cxa_dyn_string_insert_cstr
+#define dyn_string_append               __cxa_dyn_string_append
+#define dyn_string_append_cstr          __cxa_dyn_string_append_cstr
+#define dyn_string_append_char          __cxa_dyn_string_append_char
+#define dyn_string_substring            __cxa_dyn_string_substring
+#define dyn_string_eq                   __cxa_dyn_string_eq
+
+#endif /* IN_LIBGCC2 */
+
+
+extern int dyn_string_init              PARAMS ((struct dyn_string *, int));
 extern dyn_string_t dyn_string_new      PARAMS ((int));
 extern void dyn_string_delete           PARAMS ((dyn_string_t));
 extern char *dyn_string_release         PARAMS ((dyn_string_t));
 extern dyn_string_t dyn_string_resize   PARAMS ((dyn_string_t, int));
 extern void dyn_string_clear            PARAMS ((dyn_string_t));
-extern void dyn_string_copy             PARAMS ((dyn_string_t, dyn_string_t));
-extern void dyn_string_copy_cstr        PARAMS ((dyn_string_t, const char *));
-extern void dyn_string_prepend          PARAMS ((dyn_string_t, dyn_string_t));
-extern void dyn_string_prepend_cstr     PARAMS ((dyn_string_t, const char *));
-extern void dyn_string_insert           PARAMS ((dyn_string_t, int,
+extern int dyn_string_copy              PARAMS ((dyn_string_t, dyn_string_t));
+extern int dyn_string_copy_cstr         PARAMS ((dyn_string_t, const char *));
+extern int dyn_string_prepend           PARAMS ((dyn_string_t, dyn_string_t));
+extern int dyn_string_prepend_cstr      PARAMS ((dyn_string_t, const char *));
+extern int dyn_string_insert            PARAMS ((dyn_string_t, int,
                                                 dyn_string_t));
-extern void dyn_string_insert_cstr      PARAMS ((dyn_string_t, int,
+extern int dyn_string_insert_cstr       PARAMS ((dyn_string_t, int,
                                                 const char *));
-extern dyn_string_t dyn_string_append   PARAMS ((dyn_string_t, dyn_string_t));
-extern dyn_string_t dyn_string_append_cstr   
+extern int dyn_string_append            PARAMS ((dyn_string_t, dyn_string_t));
+extern int dyn_string_append_cstr   
                                         PARAMS ((dyn_string_t, const char *));
-extern dyn_string_t dyn_string_append_char
+extern int dyn_string_append_char
                                         PARAMS ((dyn_string_t, int));
-extern void dyn_string_substring        PARAMS ((dyn_string_t, 
+extern int dyn_string_substring         PARAMS ((dyn_string_t, 
                                                 dyn_string_t, int, int));
 extern int dyn_string_eq                PARAMS ((dyn_string_t, dyn_string_t));