fix build:

	install runtime lib in correct location.
	fix one bad type definition in defs.h.
	clear out $GOROOT/lib in clean.bash.

TBR=r
OCL=26691
CL=26691

diff --git a/src/clean.bash b/src/clean.bash
index 1beb6a5133ece93129c5bd83e692b0ffcd9f70a8..4b6c6d73dc4fc23b11312a165dbb3e394f891313 100755 (executable)
--- a/src/clean.bash
+++ b/src/clean.bash
@@ -4,6 +4,7 @@
 # license that can be found in the LICENSE file.
 
 rm -f $GOROOT/pkg/*.[6a]
+rm -f $GOROOT/lib/*.[6a]
 for i in lib9 libbio libmach_amd64 libregexp cmd runtime lib
 do
        cd $i

diff --git a/src/runtime/Makefile b/src/runtime/Makefile
index 5bf0dbbea8399b31a2b2436253b235ad7317b32c..633576755b8006593cf2a6036d24c7e552b3e057 100644 (file)
--- a/src/runtime/Makefile
+++ b/src/runtime/Makefile
@@ -26,6 +26,7 @@ OFILES=\
        mfixalloc.$O\
        mgc0.$O\
        mheap.$O\
+       mheapmap64.$O\
        msize.$O\
        print.$O\
        proc.$O\
@@ -49,7 +50,7 @@ HFILES=\
        $(GOOS)/$(GOARCH)/defs.h\
 
 install: $(LIB) runtime.acid
-       cp $(LIB) $(GOROOT)/lib_$(GOARCH)_$(GOOS).a
+       cp $(LIB) $(GOROOT)/lib/lib_$(GOARCH)_$(GOOS).a
        cp runtime.acid $(GOROOT)/acid/runtime.acid
 
 $(LIB): $(OFILES)

diff --git a/src/runtime/darwin/amd64/defs.h b/src/runtime/darwin/amd64/defs.h
index 8db6c2ecacf245985783340b97aac21c26e02bbb..1076e4c10a4eda86a379486d4c00e39262f8cfc0 100644 (file)
--- a/src/runtime/darwin/amd64/defs.h
+++ b/src/runtime/darwin/amd64/defs.h
@@ -80,9 +80,9 @@ typedef struct MachPort MachPort;
 struct MachPort {
        uint32 name;
        uint32 pad1;
-       uint32 pad2;
-       uint32 disposition;
-       uint32 type;
+       uint16 pad2;
+       uint8 disposition;
+       uint8 type;
 };
 
 typedef struct StackT StackT;

diff --git a/src/runtime/darwin/signal.c b/src/runtime/darwin/signal.c
index 374b6bd6f7c46d5c46e05917fedc52b16dbd6f06..88cddeb00d070939d5b4b9150808ec65433581dd 100644 (file)
--- a/src/runtime/darwin/signal.c
+++ b/src/runtime/darwin/signal.c
@@ -55,7 +55,7 @@ sighandler(int32 sig, Siginfo *info, void *context)
        r = &mc->ss;
 
        printf("Faulting address: %p\n", info->si_addr);
-       printf("PC=%X\n", r->rip);
+       printf("pc: %X\n", r->rip);
        printf("\n");
 
        if(gotraceback()){