#88742

r=cls
Enable ASM_SUFFIX in the build

config/autoconf.mk.in

@@ -158,6 +158,7 @@ OBJ_SUFFIX	= @OBJ_SUFFIX@
 LIB_SUFFIX	= @LIB_SUFFIX@
 DLL_SUFFIX	= @DLL_SUFFIX@
 BIN_SUFFIX	= @BIN_SUFFIX@
+ASM_SUFFIX	= @ASM_SUFFIX@
 USE_N32		= @USE_N32@
 
 # Temp hack.  It is not my intention to leave this crap in here for ever.

config/rules.mk

@@ -193,7 +193,7 @@ TARGETS			= $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LI
 endif
 
 ifndef OBJS
-OBJS			= $(strip $(JRI_STUB_CFILES) $(addsuffix .o, $(JMC_GEN)) $(CSRCS:.c=.o) $(CPPSRCS:.cpp=.o) $(ASFILES:.s=.o))
+OBJS			= $(strip $(JRI_STUB_CFILES) $(addsuffix .o, $(JMC_GEN)) $(CSRCS:.c=.o) $(CPPSRCS:.cpp=.o) $(ASFILES:.$(ASM_SUFFIX)=.o))
 endif
 
 ifndef HOST_OBJS
@@ -875,8 +875,12 @@ moc_%.cpp: %.h Makefile.in
 
 # The AS_DASH_C_FLAG is needed cause not all assemblers (Solaris) accept
 # a '-c' flag.
-%.o: %.s Makefile.in
+%.o: %.$(ASM_SUFFIX) Makefile.in
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+	$(AS) -Fdo:./$(OBJDIR) -Feo:.o $(ASFLAGS) $(AS_DASH_C_FLAG) $<
+else
 	$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) $<
+endif
 
 %.o: %.S Makefile.in
 	$(AS) -o $@ $(ASFLAGS) -c $<

configure.in

@@ -429,6 +429,7 @@ AS_DASH_C_FLAG='-c'
 DLL_SUFFIX=.so
 OBJ_SUFFIX=o
 LIB_SUFFIX=a
+ASM_SUFFIX=s
 TARGET_MD_ARCH=unix
 DIRENT_INO=d_ino
 
@@ -870,6 +871,7 @@ case "$target" in
     OBJ_SUFFIX=obj
     LIB_SUFFIX=lib
     DLL_SUFFIX=.dll
+    ASM_SUFFIX=asm
     DLLTOOL=''
     LD='$(CC)'
     DSO_CFLAGS=''
@@ -903,6 +905,9 @@ case "$target" in
         AR_LIST='/L'
         AR_EXTRACT='-*'
         AR_DELETE='-'
+        AS=alp
+        ASFLAGS='-Mb'
+        AS_DASH_C_FLAG=''
         LD='-ilink'
         TARGET_MD_ARCH=os2
         CFLAGS="/Q /qlibansi /Gd /Gm /Su4 /Mp /Tl-"
@@ -4489,6 +4494,7 @@ AC_DEFINE_UNQUOTED(MOZ_DLL_SUFFIX, "$DLL_SUFFIX")
 AC_SUBST(LIB_SUFFIX)
 AC_SUBST(OBJ_SUFFIX)
 AC_SUBST(BIN_SUFFIX)
+AC_SUBST(ASM_SUFFIX)
 AC_SUBST(USE_N32)
 AC_SUBST(MOZ_NSS_AUTOCONF)
 

xpcom/reflect/xptcall/src/md/os2/Makefile.in

@@ -20,13 +20,13 @@
 #
 
 DEPTH		= ../../../../../..
-topsrcdir	= @top_srcdir@
+topsrcdir		= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= xpconnect
+MODULE		= xpcom
 LIBRARY_NAME	= xptcmd
 
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
@@ -37,35 +37,15 @@ endif
 
 CPPSRCS		+= xptcstubs_os2.cpp
 
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+ASFILES		= xptcinvoke_vacpp.asm xptcstubs_vacpp.asm
+endif
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -DEXPORT_XPC_API
+DEFINES		+= -DEXPORT_XPTC_API
 
 INCLUDES	+= -I$(srcdir)/../..
-
-# The asm routines are split across two files to facilitate testing; once they
-# work properly, the files should be combined
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-ASRCS		= xptcinvoke_vacpp.asm xptcstubs_vacpp.asm
-ASFILES		= $(ASRCS:.asm=.obj)
-LIBOBJS		+= $(ASFILES)
-ASFLAGS		= -Mb                       # turn off logo
-
-ifdef MOZ_DEBUG
-ASFLAGS		+= +Ods
-endif
-
-$(ASFILES): %.obj: %.asm
-	alp $(ASFLAGS) $<
-
-export:: $(ASFILES)
-endif
-
-showobjs:
-	@echo $(ASFILES)
-	@echo $(LIBOBJS)
-
-