[svn:parrot] r38256 - in trunk/config: auto gen/makefiles

[Infinoid at svn.parrot.org]

Author: Infinoid
Date: Tue Apr 21 21:31:15 2009
New Revision: 38256
URL: https://trac.parrot.org/parrot/changeset/38256

Log:
[jit] Apply patch from he++ to make sure platform assembler helper files are preprocessed on NetBSD, by using the .S extension instead of .s.
NetBSD pkgsrc apparently uses compiler wrappers which make this unnecessary, but this change is needed to fix standalone builds.

Modified:
   trunk/config/auto/jit.pm
   trunk/config/gen/makefiles/root.in

Modified: trunk/config/auto/jit.pm
==============================================================================
--- trunk/config/auto/jit.pm	Tue Apr 21 21:31:10 2009	(r38255)
+++ trunk/config/auto/jit.pm	Tue Apr 21 21:31:15 2009	(r38256)
@@ -182,11 +182,11 @@
     my $sjit = "$arg->{jitbase}/$arg->{cpuarch}/$arg->{jitarchname}.s";
     my $asm = "$arg->{jitbase}/$arg->{cpuarch}/asm.s";
     if ( -e $sjit ) {
-        copy_if_diff( $sjit, "src/asmfun.s" );
+        copy_if_diff( $sjit, "src/asmfun.S" );
         $arg->{conf}->data->set( asmfun_o => 'src/asmfun$(O)' );
     }
     elsif ( -e $asm ) {
-        copy_if_diff( $asm, "src/asmfun.s" );
+        copy_if_diff( $asm, "src/asmfun.S" );
         $arg->{conf}->data->set( asmfun_o => 'src/asmfun$(O)' );
     }
     else {

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in	Tue Apr 21 21:31:10 2009	(r38255)
+++ trunk/config/gen/makefiles/root.in	Tue Apr 21 21:31:15 2009	(r38256)
@@ -523,7 +523,7 @@
 # These need to be above lines that define suffix rules to be portable
 # (certainly FreeBSD make doesn't grok the pir.pbc rule otherwise)
 
-.SUFFIXES : .c .s .pmc .dump $(O) .str .pir .pbc
+.SUFFIXES : .c .S .s .pmc .dump $(O) .str .pir .pbc
 
 # Passing an empty argument in @ARGV to cc_flags.pl to indicate where extra -Is
 # (etc) should go. Otherwise it will insert them after the first space, which
@@ -537,6 +537,8 @@
 
 .s$(O) : # suffix rule (limited support)
 	@$(PERL) tools/dev/cc_flags.pl $(CUR_DIR)/CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<
+.S$(O) : # suffix rule (limited support)
+	@$(PERL) tools/dev/cc_flags.pl $(CUR_DIR)/CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<
 
 # XXX These obviously require parrot: had trouble adding parrot as a dependency
 # here, though. Ignored on Mac OS X, at least.