Commit a186d523 by Alan Modra Committed by Alan Modra

Silence obstack.c -Wc++compat warning

	* obstack.c (_obstack_newchunk): Silence -Wc++compat warning.
	(_obstack_begin_worker): Likewise.  Move assignment to h->chunk
	after alloc failure check.

From-SVN: r229989
parent f0e525fe
2015-11-09 Alan Modra <amodra@gmail.com> 2015-11-09 Alan Modra <amodra@gmail.com>
* obstack.c (_obstack_newchunk): Silence -Wc++compat warning.
(_obstack_begin_worker): Likewise. Move assignment to h->chunk
after alloc failure check.
2015-11-09 Alan Modra <amodra@gmail.com>
PR gdb/17133 PR gdb/17133
* obstack.c (__alignof__): Expand alignof_type from alignof.h. * obstack.c (__alignof__): Expand alignof_type from alignof.h.
(obstack_exit_failure): Don't use exitfail.h. (obstack_exit_failure): Don't use exitfail.h.
......
...@@ -138,9 +138,10 @@ _obstack_begin_worker (struct obstack *h, ...@@ -138,9 +138,10 @@ _obstack_begin_worker (struct obstack *h,
h->chunk_size = size; h->chunk_size = size;
h->alignment_mask = alignment - 1; h->alignment_mask = alignment - 1;
chunk = h->chunk = call_chunkfun (h, h->chunk_size); chunk = (struct _obstack_chunk *) call_chunkfun (h, h->chunk_size);
if (!chunk) if (!chunk)
(*obstack_alloc_failed_handler) (); (*obstack_alloc_failed_handler) ();
h->chunk = chunk;
h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents, h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents,
alignment - 1); alignment - 1);
h->chunk_limit = chunk->limit = (char *) chunk + h->chunk_size; h->chunk_limit = chunk->limit = (char *) chunk + h->chunk_size;
...@@ -202,7 +203,7 @@ _obstack_newchunk (struct obstack *h, _OBSTACK_SIZE_T length) ...@@ -202,7 +203,7 @@ _obstack_newchunk (struct obstack *h, _OBSTACK_SIZE_T length)
/* Allocate and initialize the new chunk. */ /* Allocate and initialize the new chunk. */
if (obj_size <= sum1 && sum1 <= sum2) if (obj_size <= sum1 && sum1 <= sum2)
new_chunk = call_chunkfun (h, new_size); new_chunk = (struct _obstack_chunk *) call_chunkfun (h, new_size);
if (!new_chunk) if (!new_chunk)
(*obstack_alloc_failed_handler)(); (*obstack_alloc_failed_handler)();
h->chunk = new_chunk; h->chunk = new_chunk;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment