diff options
| author | DJ Delorie <dj@redhat.com> | 2012-10-10 07:11:22 +0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2012-10-10 07:11:22 +0400 |
| commit | 51107c1dd9a0d94fb008458e60fec55d53000284 (patch) | |
| tree | cd886b543de2e513cd8cd15b7305ec23094c069f /include | |
| parent | 64f6e90ef7111c2378d8eff8b27a1b28ca99502a (diff) | |
merge from gcc
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 10 | ||||
| -rw-r--r-- | include/demangle.h | 3 | ||||
| -rw-r--r-- | include/objalloc.h | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 4a535eb25..e702ebe61 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,13 @@ +2012-10-08 Jason Merrill <jason@redhat.com> + + * demangle.h (enum demangle_component_type): Add + DEMANGLE_COMPONENT_TLS_INIT and DEMANGLE_COMPONENT_TLS_WRAPPER. + +2012-09-18 Florian Weimer <fweimer@redhat.com> + + PR other/54411 + * objalloc.h (objalloc_alloc): Do not use fast path on wraparound. + 2012-09-27 Anthony Green <green@moxielogic.com> * opcode/moxie.h (MOXIE_BAD): New define. diff --git a/include/demangle.h b/include/demangle.h index 34b3ed3cd..5da79d852 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -272,6 +272,9 @@ enum demangle_component_type /* A guard variable. This has one subtree, the name for which this is a guard variable. */ DEMANGLE_COMPONENT_GUARD, + /* The init and wrapper functions for C++11 thread_local variables. */ + DEMANGLE_COMPONENT_TLS_INIT, + DEMANGLE_COMPONENT_TLS_WRAPPER, /* A reference temporary. This has one subtree, the name for which this is a temporary. */ DEMANGLE_COMPONENT_REFTEMP, diff --git a/include/objalloc.h b/include/objalloc.h index 36772d17b..52857663b 100644 --- a/include/objalloc.h +++ b/include/objalloc.h @@ -1,5 +1,5 @@ /* objalloc.h -- routines to allocate memory for objects - Copyright 1997, 2001 Free Software Foundation, Inc. + Copyright 1997-2012 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Solutions. This program is free software; you can redistribute it and/or modify it @@ -91,7 +91,7 @@ extern void *_objalloc_alloc (struct objalloc *, unsigned long); if (__len == 0) \ __len = 1; \ __len = (__len + OBJALLOC_ALIGN - 1) &~ (OBJALLOC_ALIGN - 1); \ - (__len <= __o->current_space \ + (__len != 0 && __len <= __o->current_space \ ? (__o->current_ptr += __len, \ __o->current_space -= __len, \ (void *) (__o->current_ptr - __len)) \ |