1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Makefile.in, */Makefile.sub, common.mk (vmasm): generalized.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11622 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-02-02 18:23:07 +00:00
parent f41d55aec8
commit fddaf76b67
6 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,4 +1,6 @@
Sat Feb 3 02:36:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Feb 3 03:22:47 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, */Makefile.sub, common.mk (vmasm): generalized.
* proc.c (yarv_proc_alloc): needs return. * proc.c (yarv_proc_alloc): needs return.

4
Makefile.in
View File

@ -86,6 +86,7 @@ AS = @AS@
ASFLAGS = @ASFLAGS@ ASFLAGS = @ASFLAGS@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
ASMEXT = S
MANTYPE = @MANTYPE@ MANTYPE = @MANTYPE@
INSTALLED_LIST= .installed.list INSTALLED_LIST= .installed.list
@ -170,6 +171,9 @@ lex.c: keywords
.s.@OBJEXT@: .s.@OBJEXT@:
$(AS) $(ASFLAGS) -o $@ $< $(AS) $(ASFLAGS) -o $@ $<
.c.S:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -S $<
clean-local:: clean-local::
@$(RM) ext/extinit.c ext/extinit.$(OBJEXT) @$(RM) ext/extinit.c ext/extinit.$(OBJEXT)

4
bcc32/Makefile.sub
View File

@ -175,6 +175,7 @@ LIBRUBYARG = $(LIBRUBY)
PREP = miniruby$(EXEEXT) PREP = miniruby$(EXEEXT)
OBJEXT = obj OBJEXT = obj
OBJEXT = asm
INSTALLED_LIST= .installed.list INSTALLED_LIST= .installed.list
@ -189,6 +190,9 @@ MINIOBJS = dmydln.$(OBJEXT)
.c.obj: .c.obj:
$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -c $(<:/=\) $(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -c $(<:/=\)
.c.asm:
$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -S $(<:\=/)
.rc.res: .rc.res:
$(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)win32 $(RFLAGS) -fo$@ $(<:/=\) $(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)win32 $(RFLAGS) -fo$@ $(<:/=\)

4
common.mk
View File

@ -612,9 +612,7 @@ tbench: $(RUBY) PHONY
aotc: aotc:
$(RUBY) -I$(srcdir) -I. $(srcdir)/tool/aotcompile.rb $(INSNS2VMOPT) $(RUBY) -I$(srcdir) -I. $(srcdir)/tool/aotcompile.rb $(INSNS2VMOPT)
# for GCC vmasm: vm.$(ASMEXT)
vmasm:
$(CC) $(CFLAGS) $(CPPFLAGS) -S $(srcdir)/vm.c
# vm.o : CFLAGS += -fno-crossjumping # vm.o : CFLAGS += -fno-crossjumping

10
win32/Makefile.sub
View File

@ -191,6 +191,7 @@ EXTSTATIC =
!endif !endif
OBJEXT = obj OBJEXT = obj
ASMEXT = asm
INSTALLED_LIST= .installed.list INSTALLED_LIST= .installed.list
@ -535,6 +536,15 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG)
.c.obj: .c.obj:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
{$(srcdir)/missing}.c.asm:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
{$(srcdir)/win32}.c.asm:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
{$(srcdir)}.c.asm:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
.c.asm:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
.rc.res: .rc.res:
$(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/) $(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/)

10
wince/Makefile.sub
View File

@ -178,6 +178,7 @@ EXTSTATIC =
!endif !endif
OBJEXT = obj OBJEXT = obj
ASMEXT = asm
INSTALLED_LIST= .installed.list INSTALLED_LIST= .installed.list
@ -501,6 +502,15 @@ end
.c.obj: .c.obj:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
{$(srcdir)/missing}.c.asm:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
{$(srcdir)/win32}.c.asm:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
{$(srcdir)}.c.asm:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
.c.asm:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa -c -Tc$(<:\=/)
.rc.res: .rc.res:
$(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/) $(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/)