From fddaf76b679f083776634c9f9ed5f92077670f79 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 2 Feb 2007 18:23:07 +0000
Subject: [PATCH] * Makefile.in, */Makefile.sub, common.mk (vmasm):
 generalized.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11622 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          |  4 +++-
 Makefile.in        |  4 ++++
 bcc32/Makefile.sub |  4 ++++
 common.mk          |  4 +---
 win32/Makefile.sub | 10 ++++++++++
 wince/Makefile.sub | 10 ++++++++++
 6 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f9601bb955..859cdf36df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Sat Feb  3 02:36:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Feb  3 03:22:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, */Makefile.sub, common.mk (vmasm): generalized.
 
 	* proc.c (yarv_proc_alloc): needs return.
 
diff --git a/Makefile.in b/Makefile.in
index 1a3373161f..23dedbe6d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,6 +86,7 @@ AS            = @AS@
 ASFLAGS       = @ASFLAGS@
 
 OBJEXT        = @OBJEXT@
+ASMEXT        = S
 MANTYPE	      = @MANTYPE@
 
 INSTALLED_LIST= .installed.list
@@ -170,6 +171,9 @@ lex.c: keywords
 .s.@OBJEXT@:
 	$(AS) $(ASFLAGS) -o $@ $<
 
+.c.S:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -S $<
+
 clean-local::
 	@$(RM) ext/extinit.c ext/extinit.$(OBJEXT)
 
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 8f32b4c936..04d1328b21 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -175,6 +175,7 @@ LIBRUBYARG    = $(LIBRUBY)
 PREP          = miniruby$(EXEEXT)
 
 OBJEXT        = obj
+OBJEXT        = asm
 
 INSTALLED_LIST= .installed.list
 
@@ -189,6 +190,9 @@ MINIOBJS      = dmydln.$(OBJEXT)
 .c.obj:
 	$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -c $(<:/=\)
 
+.c.asm:
+	$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -S $(<:\=/)
+
 .rc.res:
 	$(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)win32 $(RFLAGS) -fo$@ $(<:/=\)
 
diff --git a/common.mk b/common.mk
index cf09dcba13..d9980916ef 100644
--- a/common.mk
+++ b/common.mk
@@ -612,9 +612,7 @@ tbench: $(RUBY) PHONY
 aotc:
 	$(RUBY) -I$(srcdir) -I. $(srcdir)/tool/aotcompile.rb $(INSNS2VMOPT)
 
-# for GCC
-vmasm:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -S $(srcdir)/vm.c
+vmasm: vm.$(ASMEXT)
 
 # vm.o : CFLAGS += -fno-crossjumping
 
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index d4cac0d26f..26fd8d2b04 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -191,6 +191,7 @@ EXTSTATIC     =
 !endif
 
 OBJEXT = obj
+ASMEXT = asm
 
 INSTALLED_LIST= .installed.list
 
@@ -535,6 +536,15 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG)
 .c.obj:
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
 
+{$(srcdir)/missing}.c.asm:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
+{$(srcdir)/win32}.c.asm:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
+{$(srcdir)}.c.asm:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
+.c.asm:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
+
 .rc.res:
 	$(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/)
 
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index 5f9cffd749..b467fba4fb 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -178,6 +178,7 @@ EXTSTATIC     =
 !endif
 
 OBJEXT = obj
+ASMEXT = asm
 
 INSTALLED_LIST= .installed.list
 
@@ -501,6 +502,15 @@ end
 .c.obj:
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
 
+{$(srcdir)/missing}.c.asm:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
+{$(srcdir)/win32}.c.asm:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
+{$(srcdir)}.c.asm:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
+.c.asm:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
+
 .rc.res:
 	$(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/)