diff options
Diffstat (limited to 'src/pkg/runtime/Makefile')
| -rw-r--r-- | src/pkg/runtime/Makefile | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/pkg/runtime/Makefile b/src/pkg/runtime/Makefile index 6571d802d..e62dbe393 100644 --- a/src/pkg/runtime/Makefile +++ b/src/pkg/runtime/Makefile @@ -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 ../../Make.$(GOARCH) +include ../../Make.inc TARG=runtime @@ -12,21 +12,27 @@ SIZE_amd64=64 SIZE_arm=32 SIZE=$(SIZE_$(GOARCH)) -# Setup CFLAGS. Add -D_64BIT on 64-bit platforms (sorry). -CFLAGS_64=-D_64BIT # TODO(kaib): fix register allocation to honor extern register so we # can enable optimizations again. CFLAGS_arm=-N CFLAGS_windows=-D__WINDOWS__ -CFLAGS=-I$(GOOS) -I$(GOARCH) -I$(GOOS)/$(GOARCH) -wF $(CFLAGS_$(SIZE)) $(CFLAGS_$(GOARCH)) $(CFLAGS_$(GOOS)) +CFLAGS=-I$(GOOS) -I$(GOARCH) -I$(GOOS)/$(GOARCH) -wF $(CFLAGS_$(GOARCH)) $(CFLAGS_$(GOOS)) GOFILES=\ debug.go\ error.go\ extern.go\ sig.go\ + softfloat64.go\ type.go\ version.go\ + chan_defs.go\ + hashmap_defs.go\ + iface_defs.go\ + malloc_defs.go\ + mheapmap$(SIZE)_defs.go\ + runtime_defs.go\ + $(GOOS)/runtime_defs.go\ GOFILES_tiny=\ tiny/io.go\ @@ -116,52 +122,46 @@ $(pkgdir)/%.h: %.h clean: clean-local clean-local: - rm -f goc2c mkversion version.go */asm.h runtime.acid.* + rm -f goc2c mkversion version.go */asm.h runtime.acid.* $$(ls *.goc | sed 's/goc$$/c/') $(GOARCH)/asm.h: mkasmh.sh runtime.acid.$(GOARCH) ./mkasmh.sh >$@.x mv -f $@.x $@ goc2c: goc2c.c - $(QUOTED_GOBIN)/quietgcc -o $@ $< + quietgcc -o $@ $< mkversion: mkversion.c - $(QUOTED_GOBIN)/quietgcc -o $@ -I "$(GOROOT)/include" $< "$(GOROOT)/lib/lib9.a" + quietgcc -o $@ -I "$(GOROOT)/include" $< "$(GOROOT)/lib/lib9.a" version.go: mkversion ./mkversion >version.go %.c: %.goc goc2c - ./goc2c $< > $@.tmp + ./goc2c `pwd`/$< > $@.tmp mv -f $@.tmp $@ %.$O: $(GOARCH)/%.c - $(QUOTED_GOBIN)/$(CC) $(CFLAGS) $< + $(CC) $(CFLAGS) $< %.$O: $(GOOS)/%.c - $(QUOTED_GOBIN)/$(CC) $(CFLAGS) $< + $(CC) $(CFLAGS) $< %.$O: $(GOOS)/$(GOARCH)/%.c - $(QUOTED_GOBIN)/$(CC) $(CFLAGS) $< + $(CC) $(CFLAGS) $< %.$O: $(GOARCH)/%.s $(GOARCH)/asm.h - $(QUOTED_GOBIN)/$(AS) $< + $(AS) $< %.$O: $(GOOS)/$(GOARCH)/%.s $(GOARCH)/asm.h - $(QUOTED_GOBIN)/$(AS) $< + $(AS) $< # for discovering offsets inside structs when debugging runtime.acid.$(GOARCH): runtime.h proc.c - $(QUOTED_GOBIN)/$(CC) $(CFLAGS) -a proc.c >$@ + $(CC) $(CFLAGS) -a proc.c >$@ # 386 traceback is really amd64 traceback ifeq ($(GOARCH),386) traceback.$O: amd64/traceback.c - $(QUOTED_GOBIN)/$(CC) $(CFLAGS) $< -endif - -# NaCl closure is special. -ifeq ($(GOOS),nacl) -closure.$O: nacl/$(GOARCH)/closure.c - $(QUOTED_GOBIN)/$(CC) $(CFLAGS) $< + $(CC) $(CFLAGS) $< endif |