From bc9132dee6c4a8a4348a15ad62772d632351388b Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 11 Sep 2014 22:18:06 +0000 Subject: [PATCH] Also turn off OPTION_MASK_ABI_X32 for -m16 PR target/63228 * config/i386/i386.c (ix86_option_override_internal): Also turn off OPTION_MASK_ABI_X32 for -m16. From-SVN: r215194 --- gcc/ChangeLog | 6 ++++++ gcc/config/i386/i386.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 234ea608330..1b0700417ec 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-09-11 H.J. Lu + + PR target/63228 + * config/i386/i386.c (ix86_option_override_internal): Also turn + off OPTION_MASK_ABI_X32 for -m16. + 2014-09-11 Segher Boessenkool * config/rs6000/rs6000.md (rs6000_mftb_): Use mode iterator diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 8f45e52d9f3..cb308c9ee95 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -3346,8 +3346,9 @@ ix86_option_override_internal (bool main_args_p, /* When TARGET_BI_ARCH == 2, by default, OPTION_MASK_ABI_X32 is on and OPTION_MASK_ABI_64 is off. We turn off OPTION_MASK_ABI_X32 if OPTION_MASK_ABI_64 is turned on by - -m64. */ - if (TARGET_LP64_P (opts->x_ix86_isa_flags)) + -m64 or OPTION_MASK_CODE16 is turned on by -m16. */ + if (TARGET_LP64_P (opts->x_ix86_isa_flags) + || TARGET_16BIT_P (opts->x_ix86_isa_flags)) opts->x_ix86_isa_flags &= ~OPTION_MASK_ABI_X32; #endif } -- 2.30.2