move src/runtime -> src/lib/runtime;

hand-edited files.

R=r
DELTA=125  (77 added, 16 deleted, 32 changed)
OCL=30001
CL=30008

2 files changed, 102 insertions, 41 deletions

diff --git a/src/lib/reflect/typestring.c b/src/lib/reflect/typestring.c
index af3f366a9b..667037bb14 100644
--- a/src/lib/reflect/typestring.c
+++ b/src/lib/reflect/typestring.c
@@ -5,10 +5,7 @@
 
 extern	char	gotypestrings[];	// 4-byte count followed by byte[count]
 
-void
-FLUSH(void*)
-{
-}
+void FLUSH(void*);
 
 typedef	struct	String	String;
 struct	String
diff --git a/src/lib/runtime/Makefile b/src/lib/runtime/Makefile
index 21bf4a8a88..d4652a34f2 100644
--- a/src/lib/runtime/Makefile
+++ b/src/lib/runtime/Makefile
@@ -2,59 +2,123 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-# DO NOT EDIT.  Automatically generated by gobuild.
-# gobuild -m >Makefile
+# Set SIZE to 32 or 64.
+SIZE_386=32
+SIZE_amd64=64
+SIZE_arm=32
+SIZE=$(SIZE_$(GOARCH))
 
-D=
+# Setup CFLAGS.  Add -D_64BIT on 64-bit platforms (sorry).
+CFLAGS_64=-D_64BIT
+CFLAGS=-I$(GOOS) -I$(GOOS)/$(GOARCH) -wF $(CFLAGS_$(SIZE))
 
-include $(GOROOT)/src/Make.$(GOARCH)
-AR=gopack
+# Set O to right letter.
+O_386=8
+O_amd64=6
+O_arm=5
+O=$(O_$(GOARCH))
 
-default: packages
+# Tools
+CC=$(O)c
+GC=$(O)g
+AS=$(O)a
+AR=6ar  # sic
 
-clean:
-	rm -rf *.[$(OS)] *.a [$(OS)].out _obj
+LIB=runtime.a
 
-test: packages
-	gotest
+# 386-specific object files
+OFILES_386=\
+	vlop.$O\
+	vlrt.$O\
 
-coverage: packages
-	gotest
-	6cov -g `pwd` | grep -v '_test\.go:'
+OFILES=\
+	array.$O\
+	asm.$O\
+	chan.$O\
+	closure.$O\
+	extern.$O\
+	float.$O\
+	float_go.$O\
+	hashmap.$O\
+	iface.$O\
+	malloc.$O\
+	malloc_go.$O\
+	mcache.$O\
+	mcentral.$O\
+	mem.$O\
+	mfixalloc.$O\
+	mgc0.$O\
+	mheap.$O\
+	mheapmap$(SIZE).$O\
+	msize.$O\
+	print.$O\
+	proc.$O\
+	rune.$O\
+	runtime.$O\
+	rt0.$O\
+	sema.$O\
+	sema_go.$O\
+	signal.$O\
+	string.$O\
+	symtab.$O\
+	sys.$O\
+	thread.$O\
+	traceback.$O\
+	$(OFILES_$(GOARCH))\
 
-%.$O: %.go
-	$(GC) -I_obj $*.go
+HFILES=\
+	runtime.h\
+	hashmap.h\
+	malloc.h\
+	$(GOOS)/os.h\
+	$(GOOS)/$(GOARCH)/defs.h\
 
-%.$O: %.c
-	$(CC) $*.c
+install: $(LIB) runtime.acid
+	cp $(LIB) $(GOROOT)/pkg/$(GOOS)_$(GOARCH)/$(LIB)
+	cp runtime.acid $(GOROOT)/acid/runtime.acid
 
-%.$O: %.s
-	$(AS) $*.s
+$(LIB): $(OFILES)
+	$(AR) grc $(LIB) $(OFILES)
 
-O1=\
-	runtime.$O\
+$(OFILES): $(HFILES)
+
+nuke:
+	rm -f *.[568] *.a $(GOROOT)/lib/$(LIB)
+
+clean:
+	rm -f *.[568] *.a runtime.acid cgo2c
+
+%.$O:	%.go
+	$(GC) $<
+
+%.$O:	%.c
+	$(CC) $(CFLAGS) $<
+
+%.$O:	$(GOARCH)/%.c
+	$(CC) $(CFLAGS) $<
 
+%.$O:	$(GOOS)/%.c
+	$(CC) $(CFLAGS) $<
 
-phases: a1
-_obj$D/runtime.a: phases
+%.$O:	$(GOOS)/$(GOARCH)/%.c
+	$(CC) $(CFLAGS) $<
 
-a1: $(O1)
-	$(AR) grc _obj$D/runtime.a runtime.$O
-	rm -f $(O1)
+%.$O:	$(GOARCH)/%.s
+	$(AS) $<
 
+%.$O:	$(GOOS)/$(GOARCH)/%.s
+	$(AS) $<
 
-newpkg: clean
-	mkdir -p _obj$D
-	$(AR) grc _obj$D/runtime.a
+cgo2c: cgo2c.c
+	quietgcc -o $@ $<
 
-$(O1): newpkg
-$(O2): a1
+%.c:	%.cgo cgo2c
+	./cgo2c $< > $@.tmp
+	mv -f $@.tmp $@
 
-nuke: clean
-	rm -f $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/runtime.a
+runtime.acid: runtime.h proc.c
+	$(CC) -a proc.c >runtime.acid
 
-packages: _obj$D/runtime.a
+chan.acid: runtime.h chan.c
+	$(CC) -a chan.c >chan.acid
 
-install: packages
-	test -d $(GOROOT)/pkg && mkdir -p $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D
-	cp _obj$D/runtime.a $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/runtime.a