From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2072.outbound.protection.outlook.com [40.107.249.72]) by sourceware.org (Postfix) with ESMTPS id CEDC33858C52 for ; Fri, 20 Jan 2023 09:30:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CEDC33858C52 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ow9BoDCXcKP1jNWa298vYSWBLgd9Cgp+mH7hRFpbZc8ltfcxixXmFyna2nsALub9mmp6KccLPKsfLdgPVzxApG9g84SWnoGHYXaYa/nYcQZxKakmMzIxZ7e+R6szqPr4XkINFZtBq8vPTGuCjlQkClz5dit41cNYsnXZHyGMriIbWnZbmRgn8hO8k1DW9p2DGO+3vv0S/4gOhA87+B2Y9Hc76y+AX8mBmxAzcCMoOOxRNhNTHV09vXwwQkCXmZxZmsUvDYi/rb0Noa/pqMmWsa6Cr+5bQQtCkrsQQvvSDKdlD/CdolyRGgFOgkLmtNc/nXvjQl25ObORFCfOt7B2rw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1DGssrbi5gt8bxylay28QTDpG1E/bEIWOXhVEcam5Ow=; b=jVBsbYcESbvxeJ1G3OjghX9j7ZX3tF+txAz5IjEZmczl9gGUgZvDP+l3JFZ0tiQjU+KXxEyiuefn3YxtJ+wZlVOKcqj5Vbk5zQo/OgYd3tV+mJowxgTi5nfnQ8ftf0Vcni/waQGa+nND5s0K4j8k5sK+UqmEeP6XlrfaVvriFlpYHY7bFc2FNRow/MPrJjILkptLTDAH0a50cAv8GYGqd9eX60jLrTnPlHJJVs4X0ZTYzFqlH8rfOUig8r/sIAL8kvhPPvQbbxeXpr4FWaR7q8TDIlQsFahzJzbgNBbBR53EqT/VEYn4B/y300tvaZJyKFP8dBPwWRBOzjBeuUzxxw== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1DGssrbi5gt8bxylay28QTDpG1E/bEIWOXhVEcam5Ow=; b=4hTgNgit7Ny3GOO6HhFxD99NqGGVuZcW6wbCIjzBLaAA92qnlbR0JJ32a5wVsFOqR2j3f0Qn9A8gAEiz1sZJKyLyGsPQg51TVUxWALsmke6pzYV0zR2SqNgMeIVv/pUQkBrRR8r/FtS8oAB4pHVMQymwsmxTB3cYUg1Jlu4SfXb8VFuiIL6O54aRSWsyRxMtDxj/xIib2lS4+7d6c7XIitJe3zg5wzG4aU5AWr6p7P3EaplGrvOcQeor75Vt4cLpY7peExY4OioBeznnZUH2TgriVsyNM2AYSYRcCrWzEsQoQ1FnBd1bJE+d5IFzGjaHV3i0p4qhQhOrKOWPgOFtJg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by PAXPR04MB8909.eurprd04.prod.outlook.com (2603:10a6:102:20c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.25; Fri, 20 Jan 2023 09:30:49 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::2991:58a4:e308:4389]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::2991:58a4:e308:4389%7]) with mapi id 15.20.6002.027; Fri, 20 Jan 2023 09:30:49 +0000 Message-ID: <98a5c1d5-00c9-75b3-db8c-019e056d720c@suse.com> Date: Fri, 20 Jan 2023 10:30:48 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: [PATCH 1/2] x86: remove internationalization from i386-gen.c Content-Language: en-US To: Binutils Cc: "H.J. Lu" References: <693ee234-169d-a576-809a-07bdc2be1ba7@suse.com> From: Jan Beulich In-Reply-To: <693ee234-169d-a576-809a-07bdc2be1ba7@suse.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR3P281CA0146.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:95::18) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|PAXPR04MB8909:EE_ X-MS-Office365-Filtering-Correlation-Id: c9c42baa-ee5d-43c3-aeae-08dafac9043a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VDkJ2hYscFocXx8liYPM1JnwcBfMBIDO/ivJ/oh9FzJ9hoFl4nyNjq3bQqmo9en3tDYpNlaKpeLEjyDuoasd93kAiKid5zfkSP49azPcE/8wKLAF3JnW0KDR6BarHd/Bd0kao3EWKW3hv8QpzHq0jnj7hntnLm03sqSGwYT01S5y6vXZtHQ1rycOp4gZ2PSXYEzzyG5XFULtXZ/S6s5vPHnW/b1ch5lJGPbmBHq7RlBCZvYGDsAebvy6UFLW2qY1VXoUjRnDmaD0mXkYXtqbzTP5pC+HQicMR8VydeDQbLrFzpa27RrM8RqGyO6MnE/zXfSEuVWfLxxsKB1r/5uwmhdQISAGmWa07mYiK4alqQKmjld8kEPBlb9ItGxd3v/rfaQmg+CBcR8dRUsr+92V/kRFPpwGEiXgAzcZWM6XkPTBOa4aZMRTnjir3Im5ydw6F5KvMfdhbGXvxuXxejFLEYhEcJRytkEpmfDRLbsnaknCHUoFiFNBhlQuihA2m2hDB3MrvvuJlWJ68J0mlbSJ0jvog1Z1gAUx5IVDTcrNg71nPdRKLYROqnav1ubOaJq0Ilj6cTQwdtBQ4jGBInqRvztvHQLL/nOHEefOalGTbortHGo0lMNJwAp8ZvlPAIJPcn/ifYrV06CirV7f1w+HQhlMp9s3kJWe4CMKvK+J8E9GHhup7isi8PUtgAezlc7LhHxdFv3WeEsv1L/NJb27w+60iR1o62xjhNvLHPQN2FA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(346002)(136003)(376002)(366004)(451199015)(86362001)(31696002)(6506007)(36756003)(478600001)(6486002)(8936002)(316002)(5660300002)(66556008)(6916009)(4326008)(66476007)(38100700002)(8676002)(6512007)(41300700001)(66946007)(26005)(186003)(83380400001)(2616005)(2906002)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NWhoNEhrL1hYY292UkIwcmNvQ0g4RDNDNTViQUl5b3NMNlI3WnlYWHE5RjY1?= =?utf-8?B?TTlhV1U0VGdVWHBGYjJQR1VOSWdSalFXUWRkdDB4aGRrcUY2YlZmc1plVmVY?= =?utf-8?B?amVJTmxrVWd3UWMzelh6SGI3VUsyYUhBamRJVjM1bzR0dUVpU0FSZ3ZvSXZS?= =?utf-8?B?TDN3MTIyV2pGY0w0QnlMWkprcVY3R1Fvcm1nSCtIMEZZZlhpNjJOK3lWOXhr?= =?utf-8?B?M0pBSkxTMi9pODNQd3Z1M3BXcUFiOWFUZTdML1lZenJXQnYxNEs0WmpVdmpY?= =?utf-8?B?ZDduOVVORDRWb3ZmK0NXakhWbXVweUF0YklEOGdGcnNMUzk2Q2xLTE5oZ1R2?= =?utf-8?B?MUxKb0lWbDU0WitlZm9ORzB2OGZZSkptRG5xZXQ5RTRGY1BtdDRRRHJPcGxC?= =?utf-8?B?dmUvbHQxWjRTOUVCLzRmd2pMMlFlVXVHQVJXV0hoc2lEUjJZd3NobTU0WWQ1?= =?utf-8?B?bVoxUlFrZmlOYjhRRUoyYmM3MmpmY1VaMFNtVEZqUWkrTWNhRFBFdkFRYUND?= =?utf-8?B?NlM2ekpBZ2RuWXRrSG5Xcys2bktBU2pHSkIzWTBUNzEzMndGU21SL0hSRjdX?= =?utf-8?B?cGwxMGtpT0Z0ZzNIYjJzK0MrK2xKL1M1dW1jU0JXQ3JBZXByS05id2FjMkI1?= =?utf-8?B?aWVHVDlDY0JodVliejR4L1U3aTAvRTRlTXZpZ0dZcVJXRXl0cXNlakI3eG9s?= =?utf-8?B?NlVCK0k2ZGN5WXNvZGNIU2VJVkwxaVdHNmk3SXU0UXEyTitwekRNRFFzWWdx?= =?utf-8?B?dzVmejFLWkN4U1BDcUFha1F5TWtoKzhHNXhoajRqTWNVRTdXb0ZZS1lOUnls?= =?utf-8?B?RnRnVjJZY2U4b1JsQmEwb0tlYnhlaGpOdTd0UGZTcUlrR0VuSktheHdoaWd6?= =?utf-8?B?dHNQTUJnWWxSTHVhTWNrYWRQbmpMazR6VWxvWFJFRUFMWWlDUjNMOHh4KzV3?= =?utf-8?B?OEJPT3FVL2wyTnh6Z1JscFh1Z2R1UzFTWFVYekdGZjZHVkE0LzYvdS9RZVd0?= =?utf-8?B?NFBhczJvY3RJL0tUSTlVMVNaVm5oSDhIV1c2YSt4TG9uWk0xaWg0cnppN2M4?= =?utf-8?B?RXdJa2Y4clJJOXVVV3paU09HNlYrcUdUMi9wS0cyYmJVWmNOdHVpTnU3VUhW?= =?utf-8?B?MW9yYUM1S0liQkk5WE9ZYmtNTGpuSnAzMmJuSlM1SzNld0cvcUtJVjhnTVBM?= =?utf-8?B?elU1eDNmK01GY0tkZjAzZkVFbFVDdWxBRmZOTEtVd2JJTlFMbXlmS3cyU2Rm?= =?utf-8?B?b0VXQXIrRmhCYnZoamloV2dsbVI3eUhuS3dYekNYdTRZL1FWZ2NqSnFIVjk0?= =?utf-8?B?K2hDY3JLRWg4a0lJKzE0TnMrR0RGUmN1dkVTT1MyajAyS3lmT09UZmFMdmRP?= =?utf-8?B?cFFIZlBuSzFJTmM5SVlRdzNsVGdhNGo1ZUJZck9sSWRwUUM3dDl2cUphc0xq?= =?utf-8?B?NmNSZTh2VDRrZWhkcStmNVh2aEUzcy94eTd0SlY0WWZNaTFvVUFqYk5yQ3hy?= =?utf-8?B?clpYTGgxSzF2Q202emlQYjZUYlU2YUdDTXF1QTczNUVleWh5ODZkSk5PdlVE?= =?utf-8?B?NXhRanYvaXlEY2UxbDl6dUIyOTVBc3YvRjhMVWJFRFU2QU1CSEFsZUZ5U2s1?= =?utf-8?B?eFNLaEtCQUZVdUU2TDJpTGJ2eERpdHBQM2d0NXdQZ2JpeGRmWU8vUTRXamY4?= =?utf-8?B?WWRPMkZXcXNIRlBnU2ZmeWM4TmhtOXVLcWwzN25IaGlnOUlVMmsxZjFWK1lu?= =?utf-8?B?aXpQZXdGdFZ4STFQZkhqYkQxaDFrZUpJQ25OeDNGcEVNRmVsRlhhSEFiUnNN?= =?utf-8?B?ZUxVd3c2ZEJ0L3VXUEJSVFgxUmR6dWQwOXdHNnhQYjcvb0VQRS9oalg1TUR4?= =?utf-8?B?ZFNobTREaTIweTIxc0laY1hlVHp2RTNOdVBGdnZwNmFoUmU1Rm5jMW50a3ZS?= =?utf-8?B?dzBPdmRFVFdaRnB6MCtPS2gwN3BpblJFS1FheVpmYTQyYnE0VWVySEk0by9a?= =?utf-8?B?NldCK2tiKzBSYVIvci85aUVmVFVSRGFkRjJPZklGRE42VG0vdGwwYjNWLzBR?= =?utf-8?B?WmM4eFFGMzBOSGwrc3VjTWlITWVzUDhHY0t4SlVRSDVZTTQ5VEtZSXdjZWEw?= =?utf-8?Q?0EwWcxIffhPrlYVzm58KvN3aw?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9c42baa-ee5d-43c3-aeae-08dafac9043a X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 09:30:49.4234 (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: 4D79zDPBeO5sX5l/UflhDdJh1dwxcyIG8g9n3oeAFpAlm3jSw1jIpvMdc4Qaj8pzw9DMAydQLENrmL45IgZF4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8909 X-Spam-Status: No, score=-3028.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This is a build time helper utility, which doesn't require translation. --- It's entirely unclear to me whether such an adjustment is expected to be immediately accompanied by an update of po/opcodes.pot. --- a/opcodes/i386-gen.c +++ b/opcodes/i386-gen.c @@ -28,9 +28,6 @@ #include "i386-opc.h" -#include -#define _(String) gettext (String) - /* Build-time checks are preferrable over runtime ones. Use this construct in preference where possible. */ #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); })) @@ -557,7 +554,7 @@ fail (const char *message, ...) va_list args; va_start (args, message); - fprintf (stderr, _("%s: error: "), program_name); + fprintf (stderr, "%s: error: ", program_name); vfprintf (stderr, message, args); va_end (args); xexit (1); @@ -683,9 +680,9 @@ set_bitfield (char *f, bitfield *array, } if (lineno != -1) - fail (_("%s: %d: unknown bitfield: %s\n"), filename, lineno, f); + fail ("%s: %d: unknown bitfield: %s\n", filename, lineno, f); else - fail (_("unknown bitfield: %s\n"), f); + fail ("unknown bitfield: %s\n", f); } static void @@ -752,7 +749,7 @@ add_isa_dependencies (bitfield *flags, c } if (!is_isa) - fail (_("unknown bitfield: %s\n"), f); + fail ("unknown bitfield: %s\n", f); } static void @@ -817,7 +814,7 @@ process_i386_cpu_flag (FILE *table, char last -= 1; next = flag + 2; if (*last != ')') - fail (_("%s: %d: missing `)' in bitfield: %s\n"), filename, + fail ("%s: %d: missing `)' in bitfield: %s\n", filename, lineno, flag); *last = '\0'; } @@ -917,7 +914,7 @@ get_element_size (char **opnd, int linen while (full != NULL && strstr(full, "BaseIndex") == NULL) full = *++opnd; if (full == NULL) - fail (_("%s: %d: no memory operand\n"), filename, lineno); + fail ("%s: %d: no memory operand\n", filename, lineno); op = xstrdup (full); last = op + strlen (op); @@ -953,7 +950,7 @@ get_element_size (char **opnd, int linen free (op); if (elem_size == INT_MAX) - fail (_("%s: %d: unknown element size: %s\n"), filename, lineno, full); + fail ("%s: %d: unknown element size: %s\n", filename, lineno, full); return elem_size; } @@ -1010,11 +1007,11 @@ process_i386_opcode_modifier (FILE *tabl if (!modifiers[OpcodeSpace].value) modifiers[OpcodeSpace].value = space; else if (modifiers[OpcodeSpace].value != space) - fail (_("%s:%d: Conflicting opcode space specifications\n"), + fail ("%s:%d: Conflicting opcode space specifications\n", filename, lineno); else fprintf (stderr, - _("%s:%d: Warning: redundant opcode space specification\n"), + "%s:%d: Warning: redundant opcode space specification\n", filename, lineno); } @@ -1023,11 +1020,11 @@ process_i386_opcode_modifier (FILE *tabl if (!modifiers[OpcodePrefix].value) modifiers[OpcodePrefix].value = prefix; else if (modifiers[OpcodePrefix].value != prefix) - fail (_("%s:%d: Conflicting prefix specifications\n"), + fail ("%s:%d: Conflicting prefix specifications\n", filename, lineno); else fprintf (stderr, - _("%s:%d: Warning: redundant prefix specification\n"), + "%s:%d: Warning: redundant prefix specification\n", filename, lineno); } @@ -1250,13 +1247,13 @@ output_i386_opcode (FILE *table, const c } if (space != SPACE_0F && --length == 1) - fail (_("%s:%d: %s: unrecognized opcode encoding space\n"), + fail ("%s:%d: %s: unrecognized opcode encoding space\n", filename, lineno, name); opcode &= (1ULL << (8 * --length)) - 1; } if (length > 2) - fail (_("%s:%d: %s: residual opcode (0x%0*llx) too large\n"), + fail ("%s:%d: %s: residual opcode (0x%0*llx) too large\n", filename, lineno, name, 2 * length, opcode); ident = mkident (name); @@ -1648,7 +1645,7 @@ process_i386_opcodes (FILE *table) if (!j || buf[j - 1] != '+') break; if (j >= sizeof (buf) - 1) - fail (_("%s: %d: (continued) line too long\n"), filename, lineno); + fail ("%s: %d: (continued) line too long\n", filename, lineno); if (fgets (buf + j - 1, sizeof (buf) - j + 1, fp) == NULL) { @@ -1746,7 +1743,7 @@ process_i386_opcodes (FILE *table) fp = fopen ("i386-mnem.h", "w"); if (fp == NULL) - fail (_("can't create i386-mnem.h, errno = %s\n"), + fail ("can't create i386-mnem.h, errno = %s\n", xstrerror (errno)); process_copyright (fp); @@ -1800,7 +1797,7 @@ process_i386_registers (FILE *table) filename = "i386-reg.tbl"; fp = fopen (filename, "r"); if (fp == NULL) - fail (_("can't find i386-reg.tbl for reading, errno = %s\n"), + fail ("can't find i386-reg.tbl for reading, errno = %s\n", xstrerror (errno)); fprintf (table, "\n/* i386 register table. */\n\n"); @@ -1877,7 +1874,7 @@ process_i386_initializers (void) FILE *fp = fopen ("i386-init.h", "w"); if (fp == NULL) - fail (_("can't create i386-init.h, errno = %s\n"), + fail ("can't create i386-init.h, errno = %s\n", xstrerror (errno)); process_copyright (fp); @@ -1992,7 +1989,7 @@ main (int argc, char **argv) if (srcdir != NULL) if (chdir (srcdir) != 0) - fail (_("unable to change directory to \"%s\", errno = %s\n"), + fail ("unable to change directory to \"%s\", errno = %s\n", srcdir, xstrerror (errno)); /* cpu_flags isn't sorted by position. */ @@ -2006,16 +2003,16 @@ main (int argc, char **argv) static_assert (ARRAY_SIZE (cpu_flags) == CpuMax + 2); if ((cpumax - 1) != CpuMax) - fail (_("CpuMax != %d!\n"), cpumax); + fail ("CpuMax != %d!\n", cpumax); #else static_assert (ARRAY_SIZE (cpu_flags) == CpuMax + 1); if (cpumax != CpuMax) - fail (_("CpuMax != %d!\n"), cpumax); + fail ("CpuMax != %d!\n", cpumax); c = CpuNumOfBits - CpuMax - 1; if (c) - fail (_("%d unused bits in i386_cpu_flags.\n"), c); + fail ("%d unused bits in i386_cpu_flags.\n", c); #endif static_assert (ARRAY_SIZE (opcode_modifiers) == Opcode_Modifier_Num); @@ -2030,7 +2027,7 @@ main (int argc, char **argv) c = OTNumOfBits - OTNum; if (c) - fail (_("%d unused bits in i386_operand_type.\n"), c); + fail ("%d unused bits in i386_operand_type.\n", c); #endif qsort (cpu_flags, ARRAY_SIZE (cpu_flags), sizeof (cpu_flags [0]), @@ -2044,7 +2041,7 @@ main (int argc, char **argv) table = fopen ("i386-tbl.h", "w"); if (table == NULL) - fail (_("can't create i386-tbl.h, errno = %s\n"), + fail ("can't create i386-tbl.h, errno = %s\n", xstrerror (errno)); process_copyright (table);