diff options
| author | Russ Cox <rsc@golang.org> | 2009-06-05 10:59:37 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2009-06-05 10:59:37 -0700 |
| commit | b014be75d222e684ff34c94cd27aba88968dd36f (patch) | |
| tree | 36c9cc73a47e1982105d95309a0b3753f891c694 /src | |
| parent | 4f30ec7fcb793a4037ffa951db2b11b092c56a51 (diff) | |
| download | go-b014be75d222e684ff34c94cd27aba88968dd36f.tar.xz | |
fix 386 malloc tests,
detect 386 darwin breakpoint line.
R=r
DELTA=22 (4 added, 0 deleted, 18 changed)
OCL=29929
CL=29944
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/malloc/malloc.go | 2 | ||||
| -rw-r--r-- | src/runtime/mgc0.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/malloc/malloc.go b/src/lib/malloc/malloc.go index 8e4397a0b1..fec53f08fd 100644 --- a/src/lib/malloc/malloc.go +++ b/src/lib/malloc/malloc.go @@ -17,7 +17,7 @@ type Stats struct { EnableGC bool; } -func Alloc(uint64) *byte +func Alloc(uintptr) *byte func Free(*byte) func GetStats() *Stats func Lookup(*byte) (*byte, uintptr) diff --git a/src/runtime/mgc0.c b/src/runtime/mgc0.c index 71f5fc9807..d58d6ce44d 100644 --- a/src/runtime/mgc0.c +++ b/src/runtime/mgc0.c @@ -212,7 +212,7 @@ gc(int32 force) else gcpercent = atoi(p); } - if(gcpercent < 0 || sizeof(void*) == 4) // TODO(rsc): broken on 32-bit right now + if(gcpercent < 0) return; semacquire(&gcsema); |