From 9586b8668bc752d306f9809dcf74e955331e2f8e Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Fri, 5 Jun 2009 10:59:37 -0700 Subject: fix 386 malloc tests, detect 386 darwin breakpoint line. R=r DELTA=22 (4 added, 0 deleted, 18 changed) OCL=29929 CL=29944 --- src/lib/malloc/malloc.go | 2 +- src/runtime/mgc0.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/malloc/malloc.go b/src/lib/malloc/malloc.go index 8e4397a0b..fec53f08f 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 71f5fc980..d58d6ce44 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); -- cgit v1.2.3