nobu	2014-06-02 04:32:17 +0900 (Mon, 02 Jun 2014)

  New Revision: 46307

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

  Log:
    gmake.mk: universal assembler rules
    
    * Makefile.in (CFLAGS_NO_ARCH): split from ARCH_FLAG.
    
    * defs/gmake.mk: define assembler rules per architectures for
      universal binaries.

  Modified files:
    trunk/Makefile.in
    trunk/defs/gmake.mk
Index: defs/gmake.mk
===================================================================
--- defs/gmake.mk	(revision 46306)
+++ defs/gmake.mk	(revision 46307)
@@ -11,6 +11,12 @@ endif https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L11
 
 ifneq ($(filter universal-%,$(arch)),)
 define archcmd
+%.$(1).S: %.c
+	@$$(ECHO) translating $$< with $(2)
+	$$(Q) $$(CC) $$(CFLAGS_NO_ARCH) $(2) $$(XCFLAGS) $$(CPPFLAGS) $$(COUTFLAG)$$@ -S $$<
+
+%.S: %.$(1).S
+
 %.$(1).i: %.c
 	@$$(ECHO) preprocessing $$< with $(2)
 	$$(Q) $$(CPP) $$(warnflags) $(2) $$(XCFLAGS) $$(CPPFLAGS) $$(COUTFLAG)$$@ -E $$< > $$@
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 46306)
+++ Makefile.in	(revision 46307)
@@ -57,7 +57,8 @@ CC_VERSION = @CC_VERSION@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L57
 OUTFLAG = @OUTFLAG@$(empty)
 COUTFLAG = @COUTFLAG@$(empty)
 ARCH_FLAG = @ARCH_FLAG@
-CFLAGS = @CFLAGS@ $(ARCH_FLAG)
+CFLAGS_NO_ARCH = @CFLAGS@
+CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG)
 cflags = @cflags@
 optflags = @optflags@
 debugflags = @debugflags@

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