Index: parrot-svn/config/gen/makefiles/CFLAGS.in
===================================================================
--- parrot-svn.orig/config/gen/makefiles/CFLAGS.in	2008-12-28 18:32:46.000000000 +0100
+++ parrot-svn/config/gen/makefiles/CFLAGS.in	2009-03-05 12:48:14.390625000 +0100
@@ -11,6 +11,9 @@
 src/ops/core_ops_cg.c      -{@optimize@}    # takes too long
 src/ops/core_ops_switch.c  -{@optimize@}    # Overwhelms some compilers.
 
+#IF(cpuarch==amd64):# TT #405 amd64 --optimize problem
+#IF(cpuarch==amd64):src/gc/system.c  -{@optimize@}
+
 # io should be -Wunused clean
 {^src/io/}              s/-Wno-unused/-Wunused/
 
Index: parrot-svn/lib/Parrot/Configure/Compiler.pm
===================================================================
--- parrot-svn.orig/lib/Parrot/Configure/Compiler.pm	2009-02-27 00:31:34.000000000 +0100
+++ parrot-svn/lib/Parrot/Configure/Compiler.pm	2009-03-05 12:45:53.796875000 +0100
@@ -402,6 +402,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