aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2012-05-03 12:12:33 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2012-05-03 12:12:33 +0200
commitd5becc1117cec39943cc3cbd6d31a9c37f916408 (patch)
tree2841c203b35d3cf527762010b1a9b789390bfe6c /gcc
parent55f520f6fa224877db2b060b22f18ec1669d0f00 (diff)
downloadgcc-d5becc1117cec39943cc3cbd6d31a9c37f916408.zip
gcc-d5becc1117cec39943cc3cbd6d31a9c37f916408.tar.gz
gcc-d5becc1117cec39943cc3cbd6d31a9c37f916408.tar.bz2
re PR target/53194 (Many x86 failures)
PR target/53194 * config/i386/i386-c.c (ix86_target_macros_internal): Don't define __ATOMIC_HLE_* macros here. (ix86_target_macros): But here, using cpp_define_formatted. From-SVN: r187084
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config/i386/i386-c.c12
2 files changed, 11 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 142cf36..1023859 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-03 Jakub Jelinek <jakub@redhat.com>
+
+ PR target/53194
+ * config/i386/i386-c.c (ix86_target_macros_internal): Don't
+ define __ATOMIC_HLE_* macros here.
+ (ix86_target_macros): But here, using cpp_define_formatted.
+
2012-05-03 Richard Guenther <rguenther@suse.de>
PR tree-optimization/53144
diff --git a/gcc/config/i386/i386-c.c b/gcc/config/i386/i386-c.c
index c6551e2..23427bf 100644
--- a/gcc/config/i386/i386-c.c
+++ b/gcc/config/i386/i386-c.c
@@ -1,5 +1,5 @@
/* Subroutines used for macro/preprocessor support on the ia-32.
- Copyright (C) 2008, 2009, 2010
+ Copyright (C) 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
This file is part of GCC.
@@ -54,7 +54,6 @@ ix86_target_macros_internal (HOST_WIDE_INT isa_flag,
size_t tune_len = strlen (ix86_tune_string);
int last_arch_char = ix86_arch_string[arch_len - 1];
int last_tune_char = ix86_tune_string[tune_len - 1];
- char hle_macro[64];
/* Built-ins based on -march=. */
switch (arch)
@@ -294,12 +293,6 @@ ix86_target_macros_internal (HOST_WIDE_INT isa_flag,
def_or_undef (parse_in, "__SSE_MATH__");
if ((fpmath & FPMATH_SSE) && (isa_flag & OPTION_MASK_ISA_SSE2))
def_or_undef (parse_in, "__SSE2_MATH__");
-
- sprintf (hle_macro, "__ATOMIC_HLE_ACQUIRE=%d", IX86_HLE_ACQUIRE);
- def_or_undef (parse_in, hle_macro);
-
- sprintf (hle_macro, "__ATOMIC_HLE_RELEASE=%d", IX86_HLE_RELEASE);
- def_or_undef (parse_in, hle_macro);
}
@@ -403,6 +396,9 @@ ix86_target_macros (void)
builtin_define_std ("i386");
}
+ cpp_define_formatted (parse_in, "__ATOMIC_HLE_ACQUIRE=%d", IX86_HLE_ACQUIRE);
+ cpp_define_formatted (parse_in, "__ATOMIC_HLE_RELEASE=%d", IX86_HLE_RELEASE);
+
ix86_target_macros_internal (ix86_isa_flags,
ix86_arch,
ix86_tune,