nobu	2018-11-20 21:02:29 +0900 (Tue, 20 Nov 2018)

  New Revision: 65887

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65887

  Log:
    Make coroutine object directory for each arch

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub
Index: common.mk
===================================================================
--- common.mk	(revision 65886)
+++ common.mk	(revision 65887)
@@ -2,7 +2,7 @@ bin: $(PROGRAM) $(WPROGRAM) https://github.com/ruby/ruby/blob/trunk/common.mk#L2
 lib: $(LIBRUBY)
 dll: $(LIBRUBY_SO)
 
-.SUFFIXES: .inc .h .c .y .i .$(DTRACE_EXT)
+.SUFFIXES: .inc .h .c .y .i .$(ASMEXT) .$(DTRACE_EXT)
 
 # V=0 quiet, V=1 verbose.  other values don't work.
 V = 0
@@ -895,9 +895,9 @@ strstr.$(OBJEXT): {$(VPATH)}strstr.c https://github.com/ruby/ruby/blob/trunk/common.mk#L895
 nt.$(OBJEXT): {$(VPATH)}nt.c
 ia64.$(OBJEXT): {$(VPATH)}ia64.s
 	$(CC) $(CFLAGS) -c $<
-coroutine/amd64/Context.$(OBJEXT): {$(VPATH)}coroutine/amd64/Context.$(ASMEXT)
-coroutine/amd64/Context.$(OBJEXT): coroutine/amd64/.time
-coroutine/amd64/.time:
+$(COROUTINE_H:.h=).$(OBJEXT): {$(VPATH)}$(COROUTINE_H:.h=).$(ASMEXT)
+$(COROUTINE_H:.h=).$(OBJEXT): $(COROUTINE_H:Context.h=.time)
+$(COROUTINE_H:Context.h=.time):
 	$(Q) $(MAKEDIRS) $(@D)
 	@exit > $@
 
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 65886)
+++ win32/Makefile.sub	(revision 65887)
@@ -290,12 +290,13 @@ MISSING = $(MISSING) explicit_bzero.obj https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L290
 !endif
 DLNOBJ = dln.obj
 !if "$(ARCH)" == "x64"
-MISSING = $(MISSING) coroutine/Win64/Context.obj
 COROUTINE_H = coroutine/Win64/Context.h
 !elseif "$(ARCH)" == "i386"
-MISSING = $(MISSING) coroutine/Win32/Context.obj
 COROUTINE_H = coroutine/Win32/Context.h
 !endif
+!if defined(COROUTINE_H)
+MISSING = $(MISSING) $(COROUTINE_H:.h=.obj)
+!endif
 
 ARFLAGS = -machine:$(MACHINE) -out:
 LD = $(CC)
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 65886)
+++ Makefile.in	(revision 65887)
@@ -143,6 +143,8 @@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L143
 XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@
 BOOTSTRAPRUBY = @BOOTSTRAPRUBY@
 
+COROUTINE_H = @X_FIBER_COROUTINE_H@
+
 #### End of system configuration section. ####
 
 MAJOR=	@MAJOR@
@@ -241,7 +243,7 @@ DESTDIR       = @DESTDIR@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L243
 configure_args = @configure_args@
 #### End of variables
 
-.SUFFIXES: .inc .h .c .y .i .$(DTRACE_EXT)
+.SUFFIXES: .inc .h .c .y .i .$(ASMEXT) .$(DTRACE_EXT)
 
 all:
 
@@ -406,7 +408,6 @@ $(srcdir)/enc/jis/props.h: enc/jis/props https://github.com/ruby/ruby/blob/trunk/Makefile.in#L408
 
 .s.@OBJEXT@:
 	@$(ECHO) assembling $<
-	$(Q) $(MAKEDIRS) $(@D)
 	$(Q) $(CC) $(ASFLAGS) -o $@ -c $<
 
 .c.S:
@@ -517,7 +518,7 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(S https://github.com/ruby/ruby/blob/trunk/Makefile.in#L518
 
 enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP)
 
-cont.$(OBJEXT): @X_FIBER_COROUTINE_H@
+cont.$(OBJEXT): $(COROUTINE_H)
 
 test-bundled-gems-run:
 	$(Q) set -e; while read gem _; do \

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/