[llvm-commits] [llvm-gcc-4.2] r62588 - /llvm-gcc-4.2/trunk/gcc/config/i386/i386.c

[Duncan Sands]

Author: baldrick
Date: Tue Jan 20 12:10:20 2009
New Revision: 62588

URL: http://llvm.org/viewvc/llvm-project?rev=62588&view=rev
Log:
Revert an accidental revert of a fix: without
this, trying to use target variants such as
k8 on x86-64 linux doesn't work properly.  There
was a Fortran test for this, but since the
Fortran build was broken for several months on
this target no-one noticed.  I've added a C
test.

Modified:
    llvm-gcc-4.2/trunk/gcc/config/i386/i386.c

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/i386.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/i386.c?rev=62588&r1=62587&r2=62588&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/i386.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/i386.c Tue Jan 20 12:10:20 2009
@@ -2020,13 +2020,15 @@
         error ("-mstackrealign not supported in the 64bit mode");
       /* APPLE LOCAL end radar 4877693 */
 
+      target_flags |= TARGET_SUBTARGET64_DEFAULT & ~target_flags_explicit;
+
       /* Enable by default the SSE and MMX builtins.  Do allow the user to
          explicitly disable any of these.  In particular, disabling SSE and
          MMX for kernel code is extremely useful.  */
       if (!ix86_arch_specified)
         target_flags
-          |= ((MASK_SSE2 | MASK_SSE | MASK_MMX | MASK_128BIT_LONG_DOUBLE
-               | TARGET_SUBTARGET64_DEFAULT) & ~target_flags_explicit);
+          |= ((MASK_SSE2 | MASK_SSE | MASK_MMX | MASK_128BIT_LONG_DOUBLE)
+               & ~target_flags_explicit);
       /* APPLE LOCAL begin mainline candidate */
       /* Disable the red zone for kernel compilation.
 	 ??? Why aren't we using -mcmodel=kernel?  */