From 2f0c383d9d4059d18a12fcb39d964c3fd1d433c2 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 1 Jun 2014 19:32:17 +0000
Subject: [PATCH] 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 Makefile.in   | 3 ++-
 defs/gmake.mk | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 3fdbb89d63..f12ae5f681 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,7 +57,8 @@ CC_VERSION = @CC_VERSION@
 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@
diff --git a/defs/gmake.mk b/defs/gmake.mk
index 23977da6dc..c024f0b483 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -11,6 +11,12 @@ endif
 
 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 $$< > $$@