Navigation Menu

Skip to content

Commit

Permalink
Correct libvtv obstack use
Browse files Browse the repository at this point in the history
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
  • Loading branch information
amodra committed Nov 9, 2015
1 parent 5962bd2 commit 65c8939
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
5 changes: 5 additions & 0 deletions libvtv/ChangeLog
@@ -1,3 +1,8 @@
2015-11-09 Alan Modra <amodra@gmail.com>

* vtv_malloc.cc (obstack_chunk_free): Correct param type.
(__vtv_malloc_init): Use obstack_specify_allocation.

2015-10-20 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>

* configure.tgt (aarch64*-*-linux): Enable.
Expand Down
7 changes: 3 additions & 4 deletions libvtv/vtv_malloc.cc
Expand Up @@ -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. */
Expand All @@ -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;
}

Expand Down

0 comments on commit 65c8939

Please sign in to comment.