From b6c0357f16a84cb5aa28507f6281d1f8eb06bd85 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 31 Mar 2012 21:03:36 +0000 Subject: [PATCH] Don't check TARGET_64BIT if TARGET_64BIT_DEFAULT is false 2012-03-31 H.J. Lu PR bootstrap/52784 * config/i386/i386.c (ix86_option_override_internal): Don't check TARGET_64BIT if TARGET_64BIT_DEFAULT is false. From-SVN: r186049 --- gcc/ChangeLog | 6 ++++++ gcc/config/i386/i386.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0ec4ecdaa82..30823d933de 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-03-31 H.J. Lu + + PR bootstrap/52784 + * config/i386/i386.c (ix86_option_override_internal): Don't + check TARGET_64BIT if TARGET_64BIT_DEFAULT is false. + 2012-03-31 Eric Botcazou * tree-cfg.c (call_can_make_abnormal_goto): New predicate. diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 8cb5a0d56f5..d58dafc157d 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -3118,8 +3118,8 @@ ix86_option_override_internal (bool main_args_p) #endif /* Turn off both OPTION_MASK_ABI_64 and OPTION_MASK_ABI_X32 if - TARGET_64BIT is false. */ - if (!TARGET_64BIT) + TARGET_64BIT_DEFAULT is true and TARGET_64BIT is false. */ + if (TARGET_64BIT_DEFAULT && !TARGET_64BIT) ix86_isa_flags &= ~(OPTION_MASK_ABI_64 | OPTION_MASK_ABI_X32); #ifdef TARGET_BI_ARCH else