From 65c893900204393820e27c713e1dbe1e220bdc26 Mon Sep 17 00:00:00 2001 From: amodra Date: Mon, 9 Nov 2015 04:19:43 +0000 Subject: [PATCH] Correct libvtv obstack use Fixes a compile error with both old and new obstacks due to obstack_chunk_free having the wrong signature. Also, setting chunk size and alignment before obstack_init is pointless since they are overwritten. * vtv_malloc.cc (obstack_chunk_free): Correct param type. (__vtv_malloc_init): Use obstack_specify_allocation. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229985 138bc75d-0d04-0410-961f-82ee72b054a4 --- libvtv/ChangeLog | 5 +++++ libvtv/vtv_malloc.cc | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog index 57fe850bff5a6..4f216ac770329 100644 --- a/libvtv/ChangeLog +++ b/libvtv/ChangeLog @@ -1,3 +1,8 @@ +2015-11-09 Alan Modra + + * vtv_malloc.cc (obstack_chunk_free): Correct param type. + (__vtv_malloc_init): Use obstack_specify_allocation. + 2015-10-20 Ramana Radhakrishnan * configure.tgt (aarch64*-*-linux): Enable. diff --git a/libvtv/vtv_malloc.cc b/libvtv/vtv_malloc.cc index ecd07eb709c42..ea26b8245c378 100644 --- a/libvtv/vtv_malloc.cc +++ b/libvtv/vtv_malloc.cc @@ -194,7 +194,7 @@ obstack_chunk_alloc (size_t size) } static void -obstack_chunk_free (size_t) +obstack_chunk_free (void *) { /* Do nothing. For our purposes there should be very little de-allocation. */ @@ -217,14 +217,13 @@ __vtv_malloc_init (void) #endif VTV_error (); - obstack_chunk_size (&vtv_obstack) = VTV_PAGE_SIZE; - obstack_alignment_mask (&vtv_obstack) = sizeof (long) - 1; /* We guarantee that the obstack alloc failed handler will never be called because in case the allocation of the chunk fails, it will never return */ obstack_alloc_failed_handler = NULL; - obstack_init (&vtv_obstack); + obstack_specify_allocation (&vtv_obstack, VTV_PAGE_SIZE, sizeof (long), + obstack_chunk_alloc, obstack_chunk_free); malloc_initialized = 1; }