diff options
author | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
---|---|---|
committer | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
commit | 8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5 (patch) | |
tree | ba71646a10b518372d110532d86fcf0b98edc14f /src/pkg/runtime/race.h | |
parent | 3bb719bbf3cdb97b3901f3baaa2da9d02a5c3cdb (diff) | |
parent | 8a39ee361feb9bf46d728ff1ba4f07ca1d9610b1 (diff) | |
download | golang-8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5.tar.gz |
Merge tag 'upstream/1.3' into debian-sid
Upstream version 1.3
Diffstat (limited to 'src/pkg/runtime/race.h')
-rw-r--r-- | src/pkg/runtime/race.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pkg/runtime/race.h b/src/pkg/runtime/race.h index f7aa99dc2..fee31e09f 100644 --- a/src/pkg/runtime/race.h +++ b/src/pkg/runtime/race.h @@ -17,13 +17,14 @@ void runtime·racefini(void); void runtime·racemapshadow(void *addr, uintptr size); void runtime·racemalloc(void *p, uintptr sz); -void runtime·racefree(void *p); uintptr runtime·racegostart(void *pc); void runtime·racegoend(void); void runtime·racewritepc(void *addr, void *callpc, void *pc); void runtime·racereadpc(void *addr, void *callpc, void *pc); void runtime·racewriterangepc(void *addr, uintptr sz, void *callpc, void *pc); void runtime·racereadrangepc(void *addr, uintptr sz, void *callpc, void *pc); +void runtime·racereadobjectpc(void *addr, Type *t, void *callpc, void *pc); +void runtime·racewriteobjectpc(void *addr, Type *t, void *callpc, void *pc); void runtime·racefingo(void); void runtime·raceacquire(void *addr); void runtime·raceacquireg(G *gp, void *addr); |