From 718a3eab2906217c70f27077446fa0e8ddb1bf7b Mon Sep 17 00:00:00 2001 From: Richard Earnshaw Date: Fri, 16 Jun 2017 21:07:11 +0000 Subject: [PATCH] [arm] Mark -marm and -mthumb as being inverse options -marm and -mthumb are opposites: one cancels out the other. This patch marks them as such so that the driver will eliminate all but the last option on the command line. This aids multilib selection which otherwise can get confused if both are present. * config/arm/arm.opt (marm): Mark as the negative of of -mthumb. (mthumb): Mark as the negative of -marm. From-SVN: r249309 --- gcc/ChangeLog | 5 +++++ gcc/config/arm/arm.opt | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5b468a8b680..cbc2f524357 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2017-06-16 Richard Earnshaw + + * config/arm/arm.opt (marm): Mark as the negative of of -mthumb. + (mthumb): Mark as the negative of -marm. + 2017-06-16 Richard Earnshaw * doc/invoke.texi (ARM Options, -mcpu): Document supported diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt index efee1bef8d5..dad52576872 100644 --- a/gcc/config/arm/arm.opt +++ b/gcc/config/arm/arm.opt @@ -91,7 +91,7 @@ EnumValue Enum(arm_arch) String(native) Value(-1) DriverOnly marm -Target Report RejectNegative InverseMask(THUMB) +Target Report RejectNegative Negative(mthumb) InverseMask(THUMB) Generate code in 32 bit ARM state. mbig-endian @@ -195,7 +195,7 @@ Target RejectNegative Joined UInteger Var(arm_structure_size_boundary) Init(DEFA Specify the minimum bit alignment of structures. mthumb -Target Report RejectNegative Mask(THUMB) Save +Target Report RejectNegative Negative(marm) Mask(THUMB) Save Generate code for Thumb state. mthumb-interwork -- 2.30.2