ruby-changes:53841
From: nobu <ko1@a...>
Date: Wed, 28 Nov 2018 10:04:49 +0900 (JST)
Subject: [ruby-changes:53841] nobu:r66059 (trunk): Fix for coroutine/win32/Context.obj
nobu 2018-11-28 10:04:39 +0900 (Wed, 28 Nov 2018) New Revision: 66059 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66059 Log: Fix for coroutine/win32/Context.obj * coroutine/win32/Context.asm: old ml version 9 needs CPU directive before `.model` directive. * win32/Makefile.sub: specify object directories to separate Win32 and Win64 targets. Win32 rule was overridden by Win64 rule and just ignored. Modified files: trunk/coroutine/win32/Context.asm trunk/win32/Makefile.sub Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 66058) +++ win32/Makefile.sub (revision 66059) @@ -1225,10 +1225,10 @@ $(ruby_pc): $(RBCONFIG) https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1225 -output=$@ -mode=$(INSTALL_DATA_MODE) -config=rbconfig.rb \ $(srcdir)/template/ruby.pc.in -{$(srcdir)/coroutine/Win32}.asm.obj: +{$(srcdir)/coroutine/Win32}.asm{coroutine/Win32}.obj: $(ECHO) assembling $(<:\=/) $(Q) $(AS) $(ASFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/) -{$(srcdir)/coroutine/Win64}.asm.obj: +{$(srcdir)/coroutine/Win64}.asm{coroutine/Win64}.obj: $(ECHO) assembling $(<:\=/) $(Q) $(AS) $(ASFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/) Index: coroutine/win32/Context.asm =================================================================== --- coroutine/win32/Context.asm (revision 66058) +++ coroutine/win32/Context.asm (revision 66059) @@ -5,6 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/coroutine/win32/Context.asm#L5 ;; Copyright, 2018, by Samuel Williams. All rights reserved. ;; +.386 .model flat .code -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/