From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by sourceware.org (Postfix) with ESMTPS id CB16C3951C4C for ; Mon, 14 Jun 2021 10:26:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CB16C3951C4C Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp2054.outbound.protection.outlook.com [104.47.8.54]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-38-x5-Nn0I4PfSRxIX__GWOlQ-1; Mon, 14 Jun 2021 12:26:56 +0200 X-MC-Unique: x5-Nn0I4PfSRxIX__GWOlQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RkdIotR40pql93+PWCfrKMTfVTc6TIlryYFXl+1A+TU4sl0eapblwtWPBsrI9xq74J37pRhizErZWou6JM5c79f270FwWbeLycx8dKbvwH9EOu217OslgoaH7ogPWwAHB8HMkgGotZSDnPk6TeeSUjlIFzOGUx/7iC51c62tT+H1UlNsB+yEoL4e1CLqVFkyGZmCbPnw0W/BrJy0sxhjBL5qb9I5vkxakLhLFsXEz917nBjnAfnBIgTMSoIzgDHAwya4zeIpyLCjAUuEYTZj5XVDFRTMABMa0M0CPRLKIfW0PRLs5amIJK8F1uPExjx/erTyrg/9cqjhHShWbl1RUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4sI7sWgZ90K0XhsisyaiWWNunJt9ADqjgvrXe7h9Lds=; b=D1BVfBBLtfZgB1IuGVcdnenqCIYI8Ef7i9c6Bea//WiYtQkh5jE3gwiqz5z78rf4vmea1MY3bxpsyvCZCMizfL9oUJalHaEgVwYu+P1tKBCE5yB+7UIzuO3Ct6mEFU0DCdbUOJ0WgsEDi6otJbilucZqCnaqMtaT4xhPJvtOfwERc2f1yduads7oiF5BLczRzfoQK7+aapzod7p1OveoFZRI2jBIEsWvdkbfIKPcevUYFR5nw8Do0CJhBC0TAva2LTuml5f7y+Lhpbe5nUgvwNCztbxqxb6HJyLrMfWvb4/5PdnBbOeduaF/OmL+1HcWO4kE8H3DP7wy+adpOp/wIA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB7150.eurprd04.prod.outlook.com (2603:10a6:800:12a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Mon, 14 Jun 2021 10:26:56 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::f06c:6f5d:34d2:1c36]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::f06c:6f5d:34d2:1c36%5]) with mapi id 15.20.4219.025; Mon, 14 Jun 2021 10:26:55 +0000 Subject: [PATCH 6/6] x86: bring "gas --help" output for --32 etc in sync with reality To: Binutils References: <0babbec4-06ae-f980-18a9-20608046891b@suse.com> From: Jan Beulich Message-ID: <8022ee5b-9663-94c4-a81e-3219a439545a@suse.com> Date: Mon, 14 Jun 2021 12:26:54 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 In-Reply-To: <0babbec4-06ae-f980-18a9-20608046891b@suse.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [37.24.206.209] X-ClientProxiedBy: AM4PR0701CA0020.eurprd07.prod.outlook.com (2603:10a6:200:42::30) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [10.156.60.236] (37.24.206.209) by AM4PR0701CA0020.eurprd07.prod.outlook.com (2603:10a6:200:42::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.9 via Frontend Transport; Mon, 14 Jun 2021 10:26:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2919e887-b32f-4603-1366-08d92f1eef1a X-MS-TrafficTypeDiagnostic: VI1PR04MB7150: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g/ni5ISJ2MnNzH56X9+xwf99txi3md86VmB5wHSjT8PX6e5B/pgpIwXINqIfowROdQmFbOocHD+eoX5RXElBGp+xw//DD+8EXx2v+zvA+YAJFxKpqWmqdyLH7eHx0NfF0NEGpXuinWCVWbIlef+EUreMEIEp06DV+UrOmbkh9YxeIdC4kUIgytDl7hVrFx8AQUC2JtFd52AC1vxffkksvSENkSU0Z7CoQqc3OmqNnSvdR1o+nCQRuzM/I91LlWXPpfrZ3dmib+uFHHDCUDn9KwfcwXxRM3pI1DBH5uCT5C/ziJw5hwFhKmaOJdosCpqFqLJP4bX1+IZITXcaBULceipmvK2JKQ0QCU8GcAY/zXzJW9fBphBZfGHxQS/QwPZtneSqS/58uopSKvjW3APr30v+GXIgwKHXgUQ37BHtdKHFDjQM1gHcde+jmN3WVXUOe6wICuK970uanwUxeBL0oDSGd6ho/E+h3szIqTfJM55ct++vYRGRPxLCNBdEN5DoS4TB4EjGUNxOpR8C8WQpObAuuVqGbEoIcwerIiOT65k9oq1JJFfQ1zMGIl8KQU+humTkFaZJeizgqKRzg85lz2qCERlelm8FhKW4pNbgkWKxSInjMl/9XVhZpeshIdJ9EicSxZmBCyWppQpG6FFaB31ezts29nIGlFyc/s7BLZf8uAvL9gv4VkVXgifAnWwz X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5600.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(136003)(346002)(39860400002)(366004)(376002)(6486002)(66476007)(16526019)(66556008)(38100700002)(5660300002)(186003)(4326008)(2616005)(956004)(316002)(86362001)(6916009)(2906002)(26005)(36756003)(478600001)(8676002)(66946007)(31696002)(16576012)(31686004)(8936002)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?R01nNWUyTU9UZ0JRV0JaaDdUc1gyZnhvemx1Zmp4eWpBcHRTZ3NEc1ZmRGgr?= =?utf-8?B?VFNlcHl2dXYxdUhnMFVyWVg3bzR0WFV4bkl6bFRNeXZqQ2EwOXhicGYzYlM1?= =?utf-8?B?eklzQ3BSUk81a3RBaVRGVGFCZHdLTGJtbWxCRmd0T0ZNN2pPVEdEdTAxcEVI?= =?utf-8?B?cHlTT1RNRnN1OUE4U3NhajNYRVhPbjZyU0M5QjZ2NEhqMGszU3N2VURqWnhr?= =?utf-8?B?ajY4OUE5UXoyMmxCS3JHSnd5Q0tWTlNiVXcyYVVCeW42ek1LUkh0VGdXVVla?= =?utf-8?B?WisvZXUrOU1wSUxiZklDZ05mY0p5eS9oQXNTdVErTFF1emErd3pnTGYwMzRK?= =?utf-8?B?bG5lbW9PV1lGbWlrZWc1Q1kxMUpZUFNVaGYxZVBPZzZEeklyMmpQN2ZuSmxC?= =?utf-8?B?RHMrL2FiZmkrUDQyaWtBNUFORm5tUXFIMVZ0VDFzbStBSk1oOGM5VjJsNEFi?= =?utf-8?B?bkl4RUg5TzJMMzZYMWU5Q0tmS0EwQlRKQkYrM3h4RzRaamI4OU9DUFloazNi?= =?utf-8?B?MFhoaGJ4ZGxlbWdaWk5yM255UzV5MGJBcXkzUDZwLzdLWDgwdDIyWEFPK3g5?= =?utf-8?B?cGl0Z1htemo3aGxsSmtzdVpMbXVVMWpVOUZBZGJlQTNXc2J3WnoyL2JldWpS?= =?utf-8?B?TFk2ek52Z1JXbFBTNlZrQVVtY3ZFNUFaSzZuY2swRktGQktnbDZFOXh6VEs1?= =?utf-8?B?cUMvN01xYmdPWmVWUG5wbEFZQ0JZSzFOTkwvbUpBdDJUdU93MTNpaTd3Q3Y0?= =?utf-8?B?Z3hPSVFVNkdwZlZobWpaeEM3WmxhQTZLUDdFajRrU3R2ZzFWQUtDMFdIRzNC?= =?utf-8?B?UENCc2hobU5IWEtpZmFnN1dCbWo1UG5FN2UveXJKUTVUME81VTlVRlYyK1Qz?= =?utf-8?B?ZUlOQk1JV0hvT2hUS1ptSUMyUDdsVHRMN1EwZ3h3S3Q5cUNTczhxN1RrYzJ0?= =?utf-8?B?SjE0YW4rbGp6THpPU1VMRWVpaThVeUFXZWpuaTU4VWFET0MvWjR1ZEVMUVIx?= =?utf-8?B?V2VwOElIVlRsQTNSRmFCOGNkSUVoOTRndS9oMkM2VTMweXhkS3ZYZVdjK3FW?= =?utf-8?B?Uzh1QkZ0VVV4U0FZM3Fwb1FId1pSdlNQL3NsS2tUa3dERzVjVk9pVkp5Slkx?= =?utf-8?B?MlZnMDRFbWkvSWM0LzFGSSs4bWNFaWVRTFI5d243YVFaR0lGYy9LOVA4VzJh?= =?utf-8?B?QTlCcG9CcmFmWlAyOWttZVFscEphU1FZTW44c1BIQnZkQkpCMGVOVHlFUzBn?= =?utf-8?B?YTZmOWpoSGw2VkIzQ3NOcUVaY2J6OGdQM1BNRnJrU2hyNWhVU3VVY251UHFB?= =?utf-8?B?TDd5UWdmRm1YeGNaVzhDbkxPVEtJWnQ1VTJpaERSMGhBNFFZdG5KU2h6MnNZ?= =?utf-8?B?RU5BaStpQ0hMWTlFMHZ0ZDNlUjlkbDFRdTFBUFFKUDJaNy83a3JQa1lRejFx?= =?utf-8?B?RFpWUVk1c0t6bXpkcFJnVnZKZlF5VXI1QkxUdU0xd1o5NzJORlhrUllSZjRx?= =?utf-8?B?bEtDSHVsMk1UaUNwSWZIRjIrdkpkTGZGTTg1YTBiUVc4Vm9tYWgzL3p6UVJq?= =?utf-8?B?a2ZoQzBlcVVnRVZGS0w3REVUdU9ZaFlSQ3lONjJSeVdvUE5KRFpXbHBIYXhM?= =?utf-8?B?dDNLVlE0c2xzTXI5QlZYRXJwQlM2c3ZMbk9xWFJlQUttNnpMK1dVQjR4L29t?= =?utf-8?B?Q0RRSmNnbElYZ3psWGtPcko0WFp2SEJ4QVR5Nml6Q0k2SmtWWGJFSm1KU3Fa?= =?utf-8?Q?ed88v+A3wqfKRPFoL/5Y8WD9V/og5xpnieBI3BY?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2919e887-b32f-4603-1366-08d92f1eef1a X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 10:26:55.7713 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PWDQE4A+xG9Y1HUvGVoLIMpmAJLf3YdpP//0HxBtGl5pezqac5HFZY8nW0gd6duqKf47tReLzIASxxdCQ33onA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7150 X-Spam-Status: No, score=-3126.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2021 10:27:00 -0000 The testsuite uses the output to determine whether BFD64 is in effect. --x32 is supported for ELF only; don't advertise it for PE/COFF. --64 is also supported for Mach-O; advertise it. Adjust the testsuite's BFD64 check accordingly. Also replace "code" by "object", since it's the object format that the options primarily control. It's also _initial_ code bitness, but this can be changed by directives. gas/ 2021-06-XX Jan Beulich * config/tc-i386.c (md_show_usage): Split ELF and PE/COFF parts of object format controlling option. Add Mach-O to the latter. * testsuite/gas/i386/i386.exp (gas_bfd64_check): Adjust accordingly. --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -13719,10 +13719,14 @@ md_show_usage (FILE *stream) fprintf (stream, _("\ -s ignored\n")); #endif -#if defined BFD64 && (defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) \ - || defined (TE_PE) || defined (TE_PEP)) +#ifdef BFD64 +# if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) fprintf (stream, _("\ - --32/--64/--x32 generate 32bit/64bit/x32 code\n")); + --32/--64/--x32 generate 32bit/64bit/x32 object\n")); +# elif defined (TE_PE) || defined (TE_PEP) || defined (OBJ_MACH_O) + fprintf (stream, _("\ + --32/--64 generate 32bit/64bit object\n")); +# endif #endif #ifdef SVR4_COMMENT_CHARS fprintf (stream, _("\ --- a/gas/testsuite/gas/i386/i386.exp +++ b/gas/testsuite/gas/i386/i386.exp @@ -41,7 +41,7 @@ proc gas_bfd64_check { } { global AS set status [gas_host_run "$AS --help" ""] - return [regexp "32bit/64bit/x32" [lindex $status 1]]; + return [regexp "32bit/64bit" [lindex $status 1]]; } if [gas_32_check] then {