From 7ab9a76eac9d4999de4f37a2ce92bd324450e4d7 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 13 Jul 2004 21:10:23 +0000 Subject: [PATCH] merge from gcc --- include/ChangeLog | 13 +++++++++++++ include/libiberty.h | 4 ++-- include/obstack.h | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index fd340f0..e6af921 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,16 @@ +2004-07-13 Bernardo Innocenti + + * libiberty.h (XNEW, XCNEW, XNEWVEC, XCNEWVEC, XOBNEW): Move here from + libcpp/internal.h. + (XDELETE, XRESIZEVEC, XDELETEVEC, XNEWVAR, XCNEWVAR, XRESIZEVAR): New + macros. + +2004-07-13 Bernardo Innocenti + + * libiberty.h (ASTRDUP): Add casts required for stricter + type conversion rules of C++. + * obstack.h (obstack_free): Likewise. + 2004-07-07 Tomer Levi * dis-asm.h (print_insn_crx): Declare. diff --git a/include/libiberty.h b/include/libiberty.h index 761b2cf..5c10153 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -309,7 +309,7 @@ extern PTR C_alloca PARAMS ((size_t)) ATTRIBUTE_MALLOC; # define ASTRDUP(X) \ (__extension__ ({ const char *const libiberty_optr = (X); \ const unsigned long libiberty_len = strlen (libiberty_optr) + 1; \ - char *const libiberty_nptr = alloca (libiberty_len); \ + char *const libiberty_nptr = (char *const) alloca (libiberty_len); \ (char *) memcpy (libiberty_nptr, libiberty_optr, libiberty_len); })) #else # define alloca(x) C_alloca(x) @@ -323,7 +323,7 @@ extern unsigned long libiberty_len; # define ASTRDUP(X) \ (libiberty_optr = (X), \ libiberty_len = strlen (libiberty_optr) + 1, \ - libiberty_nptr = alloca (libiberty_len), \ + libiberty_nptr = (char *) alloca (libiberty_len), \ (char *) memcpy (libiberty_nptr, libiberty_optr, libiberty_len)) #endif diff --git a/include/obstack.h b/include/obstack.h index 5496ff2..007853e 100644 --- a/include/obstack.h +++ b/include/obstack.h @@ -494,9 +494,9 @@ __extension__ \ # define obstack_free(OBSTACK, OBJ) \ __extension__ \ ({ struct obstack *__o = (OBSTACK); \ - void *__obj = (OBJ); \ + void *__obj = (void *) (OBJ); \ if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit) \ - __o->next_free = __o->object_base = __obj; \ + __o->next_free = __o->object_base = (char *) __obj; \ else (obstack_free) (__o, __obj); }) #else /* not __GNUC__ or not __STDC__ */ -- 2.7.4