[svn:parrot] r37129 - in trunk: config/gen/makefiles lib/Parrot/Configure

[rurban at svn.parrot.org]

Author: rurban
Date: Thu Mar  5 18:43:38 2009
New Revision: 37129
URL: https://trac.parrot.org/parrot/changeset/37129

Log:
[core] TT #405 fix amd64 --optimize
patch idea by andy dougherty, tested ok 2x

Modified:
   trunk/config/gen/makefiles/CFLAGS.in
   trunk/lib/Parrot/Configure/Compiler.pm

Modified: trunk/config/gen/makefiles/CFLAGS.in
==============================================================================
--- trunk/config/gen/makefiles/CFLAGS.in	Thu Mar  5 16:58:05 2009	(r37128)
+++ trunk/config/gen/makefiles/CFLAGS.in	Thu Mar  5 18:43:38 2009	(r37129)
@@ -5,11 +5,12 @@
 #
 # Note, empty regex/options are just ignored.
 #
-src/platform.c      -{-Wcast-qual}           # noisy
-src/spf_render.c    -{-Wformat-nonliteral}   # noisy
+src/platform.c      -{-Wcast-qual}          # noisy
+src/spf_render.c    -{-Wformat-nonliteral}  # noisy
 src/tsq.c           -{@optimize@}           # never optimize tsq.c!
 src/ops/core_ops_cg.c      -{@optimize@}    # takes too long
 src/ops/core_ops_switch.c  -{@optimize@}    # Overwhelms some compilers.
+#IF(cpuarch==amd64):src/gc/system.c  -{@optimize@}              # TT #405 amd64 --optimize problem
 
 # io should be -Wunused clean
 {^src/io/}              s/-Wno-unused/-Wunused/

Modified: trunk/lib/Parrot/Configure/Compiler.pm
==============================================================================
--- trunk/lib/Parrot/Configure/Compiler.pm	Thu Mar  5 16:58:05 2009	(r37128)
+++ trunk/lib/Parrot/Configure/Compiler.pm	Thu Mar  5 18:43:38 2009	(r37129)
@@ -401,6 +401,10 @@
         print {$out} @comment, "\n"; # extra newline after header
     }
 
+    if ($target eq 'CFLAGS') {
+        $options{conditioned_lines} = 1;
+    }
+
     # this loop can not be implemented as a foreach loop as the body
     # is dependent on <IN> being evaluated lazily