diff options
| author | Ian Lance Taylor <iant@google.com> | 2014-06-04 23:15:33 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2014-06-04 23:15:33 +0000 |
| commit | bae90c989cb020d17a24919ec84c0b8dd2fae2da (patch) | |
| tree | 89766166feb4ceca2d983169c5360e3f6f521b12 /libgo/runtime/malloc.h | |
| parent | 82b3da6a714493644a4333bfd8205e3341ed3b8e (diff) | |
| download | gcc-bae90c989cb020d17a24919ec84c0b8dd2fae2da.zip gcc-bae90c989cb020d17a24919ec84c0b8dd2fae2da.tar.gz gcc-bae90c989cb020d17a24919ec84c0b8dd2fae2da.tar.bz2 | |
libgo: Merge from revision 18783:00cce3a34d7e of master library.
This revision was committed January 7, 2014. The next
revision deleted runtime/mfinal.c. That will be done in a
subsequent merge.
This merge changes type descriptors to add a zero field,
pointing to a zero value for that type. This is implemented
as a common variable.
* go-gcc.cc (Gcc_backend::implicit_variable): Add is_common and
alignment parameters. Permit init parameter to be NULL.
From-SVN: r211249
Diffstat (limited to 'libgo/runtime/malloc.h')
| -rw-r--r-- | libgo/runtime/malloc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libgo/runtime/malloc.h b/libgo/runtime/malloc.h index e1a5be9..16f51a5 100644 --- a/libgo/runtime/malloc.h +++ b/libgo/runtime/malloc.h @@ -449,7 +449,8 @@ void* runtime_mallocgc(uintptr size, uintptr typ, uint32 flag); void* runtime_persistentalloc(uintptr size, uintptr align, uint64 *stat); int32 runtime_mlookup(void *v, byte **base, uintptr *size, MSpan **s); void runtime_gc(int32 force); -void runtime_markallocated(void *v, uintptr n, bool noptr); +void runtime_markscan(void *v); +void runtime_marknogc(void *v); void runtime_checkallocated(void *v, uintptr n); void runtime_markfreed(void *v, uintptr n); void runtime_checkfreed(void *v, uintptr n); @@ -484,7 +485,7 @@ struct Obj uintptr ti; // type info }; -void runtime_MProf_Malloc(void*, uintptr); +void runtime_MProf_Malloc(void*, uintptr, uintptr); void runtime_MProf_Free(void*, uintptr); void runtime_MProf_GC(void); void runtime_MProf_Mark(void (*addroot)(Obj)); |