runtime: make more build-friendly

Collapse the arch,os-specific directories into the main directory
by renaming xxx/foo.c to foo_xxx.c, and so on.

There are no substantial edits here, except to the Makefile.
The assumption is that the Go tool will #define GOOS_darwin
and GOARCH_amd64 and will make any file named something
like signals_darwin.h available as signals_GOOS.h during the
build.  This replaces what used to be done with -I$(GOOS).

There is still work to be done to make runtime build with
standard tools, but this is a big step.  After this we will have
to write a script to generate all the generated files so they
can be checked in (instead of generated during the build).

R=r, iant, r, lucio.dere
CC=golang-dev
https://golang.org/cl/5490053

src/pkg/runtime/Makefile

@@ -4,16 +4,10 @@
 
 include ../../Make.inc
 
-TARG=runtime
-
-# Set SIZE to 32 or 64.
-SIZE_386=32
-SIZE_amd64=64
-SIZE_arm=32
-SIZE=$(SIZE_$(GOARCH))
+# Go tool will do this for package runtime.
+CFLAGS+=-DGOOS_$(GOOS) -DGOARCH_$(GOARCH)
 
-CFLAGS_windows=-D__WINDOWS__
-CFLAGS=-I$(GOOS) -I$(GOARCH) -I$(GOOS)/$(GOARCH) -FVw $(CFLAGS_$(GOARCH)) $(CFLAGS_$(GOOS))
+TARG=runtime
 
 GOFILES=\
 	debug.go\
@@ -49,29 +43,29 @@ OFILES_plan9=\
 	lock_sema.$O\
 
 OFILES_windows=\
-	callback.$O\
+	callback_windows_$(GOARCH).$O\
 	lock_sema.$O\
-	syscall.$O\
+	syscall_windows.$O\
 
 # 386-specific object files
 OFILES_386=\
-	vlop.$O\
-	vlrt.$O\
+	vlop_386.$O\
+	vlrt_386.$O\
 
 # arm-specific object files
 OFILES_arm=\
-	memset.$O\
-	softfloat.$O\
-	vlop.$O\
-	vlrt.$O\
+	memset_arm.$O\
+	softfloat_arm.$O\
+	vlop_arm.$O\
+	vlrt_arm.$O\
 
 OFILES=\
 	alg.$O\
-	asm.$O\
-	atomic.$O\
+	asm_$(GOARCH).$O\
+	atomic_$(GOARCH).$O\
 	cgocall.$O\
 	chan.$O\
-	closure.$O\
+	closure_$(GOARCH).$O\
 	complex.$O\
 	cpuprof.$O\
 	float.$O\
@@ -80,8 +74,8 @@ OFILES=\
 	malloc.$O\
 	mcache.$O\
 	mcentral.$O\
-	mem.$O\
-	memmove.$O\
+	mem_$(GOOS).$O\
+	memmove_$(GOARCH).$O\
 	mfinal.$O\
 	mfixalloc.$O\
 	mgc0.$O\
@@ -90,33 +84,36 @@ OFILES=\
 	msize.$O\
 	print.$O\
 	proc.$O\
-	rt0.$O\
+	rt0_$(GOOS)_$(GOARCH).$O\
 	rune.$O\
 	runtime.$O\
 	runtime1.$O\
 	sema.$O\
-	signal.$O\
+	signal_$(GOOS)_$(GOARCH).$O\
 	sigqueue.$O\
 	slice.$O\
 	string.$O\
 	symtab.$O\
-	sys.$O\
-	thread.$O\
+	sys_$(GOOS)_$(GOARCH).$O\
+	thread_$(GOOS).$O\
 	time.$O\
-	traceback.$O\
+	traceback_$(GOARCH).$O\
 	$(OFILES_$(GOARCH))\
 	$(OFILES_$(GOOS))\
 
+AUTOHFILES=\
+	arch_GOARCH.h\
+	os_GOOS.h\
+	signals_GOOS.h\
+	defs_GOOS_GOARCH.h\
+
 HFILES=\
 	cgocall.h\
 	runtime.h\
 	hashmap.h\
 	malloc.h\
 	stack.h\
-	$(GOARCH)/asm.h\
-	$(GOOS)/os.h\
-	$(GOOS)/signals.h\
-	$(GOOS)/$(GOARCH)/defs.h\
+	$(AUTOHFILES)\
 
 GOFILES+=$(GOFILES_$(GOOS))
 
@@ -135,9 +132,9 @@ $(pkgdir)/%.h: %.h
 clean: clean-local
 
 clean-local:
-	rm -f goc2c mkversion version.go */asm.h runtime.acid.* runtime_defs.go $$(ls *.goc | sed 's/goc$$/c/')
+	rm -f goc2c mkversion version.go runtime.acid.* runtime_defs.go $$(ls *.goc | sed 's/goc$$/c/') $(AUTOHFILES)
 
-$(GOARCH)/asm.h: mkasmh.sh runtime.acid.$(GOARCH)
+asm_$(GOARCH).h: mkasmh.sh runtime.acid.$(GOARCH)
 	./mkasmh.sh >$@.x
 	mv -f $@.x $@
 
@@ -160,20 +157,7 @@ version_$(GOOS).go:
 	./goc2c "`pwd`/$<" > $@.tmp
 	mv -f $@.tmp $@
 
-%.$O:	$(GOARCH)/%.c $(HFILES)
-	$(CC) $(CFLAGS) $<
-
-%.$O:	$(GOOS)/%.c $(HFILES)
-	$(CC) $(CFLAGS) $<
-
-%.$O:	$(GOOS)/$(GOARCH)/%.c $(HFILES)
-	$(CC) $(CFLAGS) $<
-
-%.$O:	$(GOARCH)/%.s $(GOARCH)/asm.h
-	$(AS) $<
-
-%.$O:	$(GOOS)/$(GOARCH)/%.s $(GOARCH)/asm.h
-	$(AS) $<
+%.$O: asm_$(GOARCH).h
 
 # for discovering offsets inside structs when debugging
 runtime.acid.$(GOARCH): runtime.h proc.c
@@ -185,6 +169,18 @@ traceback.$O:	amd64/traceback.c
 	$(CC) $(CFLAGS) $<
 endif
 
-runtime_defs.go: proc.c iface.c hashmap.c chan.c
-	CC="$(CC)" CFLAGS="$(CFLAGS)" ./mkgodefs.sh $^ > $@.x
+runtime_defs.go: proc.c iface.c hashmap.c chan.c $(HFILES)
+	CC="$(CC)" CFLAGS="$(CFLAGS)" ./mkgodefs.sh proc.c iface.c hashmap.c chan.c > $@.x
 	mv -f $@.x $@
+
+arch_GOARCH.h: arch_$(GOARCH).h
+	cp $^ $@
+
+defs_GOOS_GOARCH.h: defs_$(GOOS)_$(GOARCH).h
+	cp $^ $@
+
+os_GOOS.h: os_$(GOOS).h
+	cp $^ $@
+
+signals_GOOS.h: signals_$(GOOS).h
+	cp $^ $@

src/pkg/runtime/386/asm.s → src/pkg/runtime/asm_386.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#include "386/asm.h"
+#include "asm_386.h"
 
 TEXT _rt0_386(SB),7,$0
 	// Linux, Windows start the FPU in extended double precision.

src/pkg/runtime/amd64/asm.s → src/pkg/runtime/asm_amd64.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#include "amd64/asm.h"
+#include "asm_amd64.h"
 
 TEXT _rt0_amd64(SB),7,$-8
 	// copy arguments forward on an even stack

src/pkg/runtime/arm/asm.s → src/pkg/runtime/asm_arm.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#include "arm/asm.h"
+#include "asm_arm.h"
 
 // using frame size $-4 means do not save LR on stack.
 TEXT _rt0_arm(SB),7,$-4

src/pkg/runtime/windows/386/callback.c → src/pkg/runtime/callback_windows_386.c

@@ -4,8 +4,8 @@
 
 #include "runtime.h"
 #include "type.h"
-#include "defs.h"
-#include "os.h"
+#include "defs_GOOS_GOARCH.h"
+#include "os_GOOS.h"
 
 // Will keep all callbacks in a linked list, so they don't get garbage collected.
 typedef	struct	Callback	Callback;

src/pkg/runtime/windows/amd64/callback.c → src/pkg/runtime/callback_windows_amd64.c

@@ -4,8 +4,8 @@
 
 #include "runtime.h"
 #include "type.h"
-#include "defs.h"
-#include "os.h"
+#include "defs_GOOS_GOARCH.h"
+#include "os_GOOS.h"
 
 // Will keep all callbacks in a linked list, so they don't get garbage collected.
 typedef	struct	Callback	Callback;

src/pkg/runtime/cgocall.c

@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "arch.h"
+#include "arch_GOARCH.h"
 #include "stack.h"
 #include "cgocall.h"
 

src/pkg/runtime/cpuprof.c

@@ -49,7 +49,7 @@
 // in the situation when normally the goroutine "owns" handoff.
 
 #include "runtime.h"
-#include "arch.h"
+#include "arch_GOARCH.h"
 #include "malloc.h"
 
 enum

src/pkg/runtime/iface.c

@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "arch.h"
+#include "arch_GOARCH.h"
 #include "type.h"
 #include "malloc.h"
 

src/pkg/runtime/malloc.goc

@@ -8,10 +8,10 @@
 
 package runtime
 #include "runtime.h"
-#include "arch.h"
+#include "arch_GOARCH.h"
 #include "stack.h"
 #include "malloc.h"
-#include "defs.h"
+#include "defs_GOOS_GOARCH.h"
 #include "type.h"
 
 MHeap runtime·mheap;

src/pkg/runtime/mcache.c

@@ -7,7 +7,7 @@
 // See malloc.h for an overview.
 
 #include "runtime.h"
-#include "arch.h"
+#include "arch_GOARCH.h"
 #include "malloc.h"
 
 void*

src/pkg/runtime/mcentral.c

@@ -15,7 +15,7 @@
 // so that it is faster to move those lists between MCaches and MCentrals.
 
 #include "runtime.h"
-#include "arch.h"
+#include "arch_GOARCH.h"
 #include "malloc.h"
 
 static bool MCentral_Grow(MCentral *c);

src/pkg/runtime/darwin/mem.c → src/pkg/runtime/mem_darwin.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "arch.h"
-#include "defs.h"
-#include "os.h"
+#include "arch_GOARCH.h"
+#include "defs_GOOS_GOARCH.h"
+#include "os_GOOS.h"
 #include "malloc.h"
 
 void*

src/pkg/runtime/freebsd/mem.c → src/pkg/runtime/mem_freebsd.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "arch.h"
-#include "defs.h"
-#include "os.h"
+#include "arch_GOARCH.h"
+#include "defs_GOOS_GOARCH.h"
+#include "os_GOOS.h"
 #include "malloc.h"
 
 void*

src/pkg/runtime/linux/mem.c → src/pkg/runtime/mem_linux.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "arch.h"
-#include "defs.h"
-#include "os.h"
+#include "arch_GOARCH.h"
+#include "defs_GOOS_GOARCH.h"
+#include "os_GOOS.h"
 #include "malloc.h"
 
 enum

src/pkg/runtime/netbsd/mem.c → src/pkg/runtime/mem_netbsd.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "arch.h"
-#include "defs.h"
-#include "os.h"
+#include "arch_GOARCH.h"
+#include "defs_GOOS_GOARCH.h"
+#include "os_GOOS.h"
 #include "malloc.h"
 
 enum

src/pkg/runtime/openbsd/mem.c → src/pkg/runtime/mem_openbsd.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "arch.h"
-#include "defs.h"
-#include "os.h"
+#include "arch_GOARCH.h"
+#include "defs_GOOS_GOARCH.h"
+#include "os_GOOS.h"
 #include "malloc.h"
 
 enum

src/pkg/runtime/plan9/mem.c → src/pkg/runtime/mem_plan9.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "arch.h"
+#include "arch_GOARCH.h"
 #include "malloc.h"
-#include "os.h"
+#include "os_GOOS.h"
 
 extern byte end[];
 static byte *bloc = { end };

src/pkg/runtime/windows/mem.c → src/pkg/runtime/mem_windows.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "arch.h"
-#include "os.h"
-#include "defs.h"
+#include "arch_GOARCH.h"
+#include "os_GOOS.h"
+#include "defs_GOOS_GOARCH.h"
 #include "malloc.h"
 
 enum {

src/pkg/runtime/mfinal.c

@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "arch.h"
+#include "arch_GOARCH.h"
 #include "malloc.h"
 
 enum { debug = 0 };

src/pkg/runtime/mfixalloc.c

@@ -7,7 +7,7 @@
 // See malloc.h for overview.
 
 #include "runtime.h"
-#include "arch.h"
+#include "arch_GOARCH.h"
 #include "malloc.h"
 
 // Initialize f to allocate objects of the given size,

src/pkg/runtime/mgc0.c

@@ -5,7 +5,7 @@
 // Garbage collector.
 
 #include "runtime.h"
-#include "arch.h"
+#include "arch_GOARCH.h"
 #include "malloc.h"
 #include "stack.h"
 

src/pkg/runtime/mheap.c

@@ -13,7 +13,7 @@
 // and heapmap(i) == span for all s->start <= i < s->start+s->npages.
 
 #include "runtime.h"
-#include "arch.h"
+#include "arch_GOARCH.h"
 #include "malloc.h"
 
 static MSpan *MHeap_AllocLocked(MHeap*, uintptr, int32);

src/pkg/runtime/mprof.goc

@@ -7,9 +7,9 @@
 
 package runtime
 #include "runtime.h"
-#include "arch.h"
+#include "arch_GOARCH.h"
 #include "malloc.h"
-#include "defs.h"
+#include "defs_GOOS_GOARCH.h"
 #include "type.h"
 
 // NOTE(rsc): Everything here could use cas if contention became an issue.

src/pkg/runtime/msize.c

@@ -26,7 +26,7 @@
 // TODO(rsc): Compute max waste for any given size.
 
 #include "runtime.h"
-#include "arch.h"
+#include "arch_GOARCH.h"
 #include "malloc.h"
 
 int32 runtime·class_to_size[NumSizeClasses];

src/pkg/runtime/proc.c

@@ -3,10 +3,10 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "arch.h"
-#include "defs.h"
+#include "arch_GOARCH.h"
+#include "defs_GOOS_GOARCH.h"
 #include "malloc.h"
-#include "os.h"
+#include "os_GOOS.h"
 #include "stack.h"
 
 bool	runtime·iscgo;

src/pkg/runtime/windows/amd64/rt0.s → src/pkg/runtime/rt0_windows_amd64.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#include "amd64/asm.h"
+#include "asm_amd64.h"
 
 TEXT	_rt0_amd64_windows(SB),7,$-8
 	MOVQ	$_rt0_amd64(SB), AX

src/pkg/runtime/runtime.h

@@ -241,7 +241,7 @@ struct	M
 	uint32	waitsemacount;
 	uint32	waitsemalock;
 
-#ifdef __WINDOWS__
+#ifdef GOOS_windows
 	void*	thread;		// thread handle
 #endif
 	uintptr	end[];
@@ -299,7 +299,7 @@ struct	WinCall
 	uintptr	err;	// error number
 };
 
-#ifdef __WINDOWS__
+#ifdef GOOS_windows
 enum {
    Windows = 1
 };

src/pkg/runtime/sema.goc

@@ -19,7 +19,7 @@
 
 package runtime
 #include "runtime.h"
-#include "arch.h"
+#include "arch_GOARCH.h"
 
 typedef struct Sema Sema;
 struct Sema

src/pkg/runtime/darwin/386/signal.c → src/pkg/runtime/signal_darwin_386.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "defs.h"
-#include "os.h"
-#include "signals.h"
+#include "defs_GOOS_GOARCH.h"
+#include "os_GOOS.h"
+#include "signals_GOOS.h"
 
 void
 runtime·dumpregs(Regs32 *r)

src/pkg/runtime/darwin/amd64/signal.c → src/pkg/runtime/signal_darwin_amd64.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "defs.h"
-#include "os.h"
-#include "signals.h"
+#include "defs_GOOS_GOARCH.h"
+#include "os_GOOS.h"
+#include "signals_GOOS.h"
 
 void
 runtime·dumpregs(Regs64 *r)

src/pkg/runtime/freebsd/386/signal.c → src/pkg/runtime/signal_freebsd_386.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "defs.h"
-#include "signals.h"
-#include "os.h"
+#include "defs_GOOS_GOARCH.h"
+#include "signals_GOOS.h"
+#include "os_GOOS.h"
 
 extern void runtime·sigtramp(void);
 

src/pkg/runtime/freebsd/amd64/signal.c → src/pkg/runtime/signal_freebsd_amd64.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "defs.h"
-#include "signals.h"
-#include "os.h"
+#include "defs_GOOS_GOARCH.h"
+#include "signals_GOOS.h"
+#include "os_GOOS.h"
 
 extern void runtime·sigtramp(void);
 

src/pkg/runtime/linux/386/signal.c → src/pkg/runtime/signal_linux_386.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "defs.h"
-#include "signals.h"
-#include "os.h"
+#include "defs_GOOS_GOARCH.h"
+#include "signals_GOOS.h"
+#include "os_GOOS.h"
 
 void
 runtime·dumpregs(Sigcontext *r)

src/pkg/runtime/linux/amd64/signal.c → src/pkg/runtime/signal_linux_amd64.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "defs.h"
-#include "signals.h"
-#include "os.h"
+#include "defs_GOOS_GOARCH.h"
+#include "signals_GOOS.h"
+#include "os_GOOS.h"
 
 void
 runtime·dumpregs(Sigcontext *r)

src/pkg/runtime/linux/arm/signal.c → src/pkg/runtime/signal_linux_arm.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "defs.h"
-#include "signals.h"
-#include "os.h"
+#include "defs_GOOS_GOARCH.h"
+#include "signals_GOOS.h"
+#include "os_GOOS.h"
 
 void
 runtime·dumpregs(Sigcontext *r)

src/pkg/runtime/openbsd/386/signal.c → src/pkg/runtime/signal_netbsd_386.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "defs.h"
-#include "signals.h"
-#include "os.h"
+#include "defs_GOOS_GOARCH.h"
+#include "signals_GOOS.h"
+#include "os_GOOS.h"
 
 extern void runtime·sigtramp(void);
 

src/pkg/runtime/netbsd/amd64/signal.c → src/pkg/runtime/signal_netbsd_amd64.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "defs.h"
-#include "signals.h"
-#include "os.h"
+#include "defs_GOOS_GOARCH.h"
+#include "signals_GOOS.h"
+#include "os_GOOS.h"
 
 extern void runtime·sigtramp(void);
 

src/pkg/runtime/netbsd/386/signal.c → src/pkg/runtime/signal_openbsd_386.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "defs.h"
-#include "signals.h"
-#include "os.h"
+#include "defs_GOOS_GOARCH.h"
+#include "signals_GOOS.h"
+#include "os_GOOS.h"
 
 extern void runtime·sigtramp(void);
 

src/pkg/runtime/openbsd/amd64/signal.c → src/pkg/runtime/signal_openbsd_amd64.c

@@ -3,9 +3,9 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "defs.h"
-#include "signals.h"
-#include "os.h"
+#include "defs_GOOS_GOARCH.h"
+#include "signals_GOOS.h"
+#include "os_GOOS.h"
 
 extern void runtime·sigtramp(void);
 

src/pkg/runtime/windows/386/signal.c → src/pkg/runtime/signal_windows_386.c

@@ -3,8 +3,8 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "defs.h"
-#include "os.h"
+#include "defs_GOOS_GOARCH.h"
+#include "os_GOOS.h"
 
 void
 runtime·dumpregs(Context *r)

src/pkg/runtime/windows/amd64/signal.c → src/pkg/runtime/signal_windows_amd64.c

@@ -3,8 +3,8 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
-#include "defs.h"
-#include "os.h"
+#include "defs_GOOS_GOARCH.h"
+#include "os_GOOS.h"
 
 extern void *runtime·sigtramp;