From fd7175fa1465d4f414c76ac7035bd65b479a95c3 Mon Sep 17 00:00:00 2001 From: Makoto Kato Date: Thu, 25 Aug 2011 18:31:52 +0900 Subject: [PATCH] Bug 675135 - should use -Fo instead of -o on MASM. r=ted --- config/rules.mk | 8 +++++++- js/src/config/rules.mk | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/config/rules.mk b/config/rules.mk index 59cee5577e4..53912cadb67 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -681,6 +681,12 @@ else OUTOPTION = -o # eol endif # WINNT && !GNU_CC +ifneq (,$(filter ml%,$(AS))) +ASOUTOPTION = -Fo# eol +else +ASOUTOPTION = -o # eol +endif + ifeq (,$(CROSS_COMPILE)) HOST_OUTOPTION = $(OUTOPTION) else @@ -1286,7 +1292,7 @@ ifdef ASFILES # The AS_DASH_C_FLAG is needed cause not all assemblers (Solaris) accept # a '-c' flag. %.$(OBJ_SUFFIX): %.$(ASM_SUFFIX) $(GLOBAL_DEPS) - $(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) $(_VPATH_SRCS) + $(AS) $(ASOUTOPTION)$@ $(ASFLAGS) $(AS_DASH_C_FLAG) $(_VPATH_SRCS) endif %.$(OBJ_SUFFIX): %.S $(GLOBAL_DEPS) diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index 59cee5577e4..53912cadb67 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -681,6 +681,12 @@ else OUTOPTION = -o # eol endif # WINNT && !GNU_CC +ifneq (,$(filter ml%,$(AS))) +ASOUTOPTION = -Fo# eol +else +ASOUTOPTION = -o # eol +endif + ifeq (,$(CROSS_COMPILE)) HOST_OUTOPTION = $(OUTOPTION) else @@ -1286,7 +1292,7 @@ ifdef ASFILES # The AS_DASH_C_FLAG is needed cause not all assemblers (Solaris) accept # a '-c' flag. %.$(OBJ_SUFFIX): %.$(ASM_SUFFIX) $(GLOBAL_DEPS) - $(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) $(_VPATH_SRCS) + $(AS) $(ASOUTOPTION)$@ $(ASFLAGS) $(AS_DASH_C_FLAG) $(_VPATH_SRCS) endif %.$(OBJ_SUFFIX): %.S $(GLOBAL_DEPS)