From patchwork Fri Jan 20 09:30:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 46256 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp100462wrn; Fri, 20 Jan 2023 01:31:04 -0800 (PST) X-Google-Smtp-Source: AMrXdXvH2Bs5ZM/STEjn9Z3C0lsLmSM3nMXB0qTSGnDmLhR2pc7QuCuLdncO+zMy72nNK8M91mJO X-Received: by 2002:a05:6402:ea8:b0:494:fae3:c0df with SMTP id h40-20020a0564020ea800b00494fae3c0dfmr14153001eda.12.1674207064662; Fri, 20 Jan 2023 01:31:04 -0800 (PST) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id cm16-20020a0564020c9000b0049622a61f8bsi4663957edb.307.2023.01.20.01.31.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 01:31:04 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=jBW9OC6c; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 75C4C3858434 for ; Fri, 20 Jan 2023 09:31:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 75C4C3858434 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674207062; bh=1DGssrbi5gt8bxylay28QTDpG1E/bEIWOXhVEcam5Ow=; h=Date:Subject:To:Cc:References:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=jBW9OC6c0EwK+IDHeMlWkIuIUOLRK7gVEVhAj71FwBdRfOteDtJ90/zx89iDeaIrh udqca04DZ71XoGJv3tRWopNhJDw6n8bOl90X4qLtNDQhuRSIxyfeH/n+8sDTibB9mv Wot35OEd7lpXNqwpqu0q6uj9yCRz/6bLxsG2TTUE= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org 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 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 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> In-Reply-To: <693ee234-169d-a576-809a-07bdc2be1ba7@suse.com> 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?q?5hh4Hk/XXcovRB0rcoCH8D3C55bA?= =?utf-8?q?IyosL6R7ZyXXq9F65M9aWU4TgUXpFb2PGUNIgRjQWQddt0xhdkqF6bVfsZeVeXjeI?= =?utf-8?q?NlkUgwQc3zXzHb7UK2aHAjdIV35o4tuEiSARgvoIvRL3w122WjFcL4ByLZJkqV7GQ?= =?utf-8?q?ormgH+H0FYfXi62N+yV9xk3JAJLS2/i83Pwvu3pWqAb9aTe7L/YYzrWBv14K4ZjUv?= =?utf-8?q?jXd7n9UND4Vovf+CWjHVmupyAtbID8gFrsLS96ClKLNhgTv1LJoIVl54Z+efoNG0v?= =?utf-8?q?8fYJJmDnqet9E4FcPmt4QDrOplBve/lt1Z4S9EB/4fwjL2QeUuGARWWHhsiDR2Yws?= =?utf-8?q?hm54Yd5mZ1RQkfiNb8QEJ2bc72jfcUZ0SmTFjQi+McaDPEvAQaCC6S6zJAgdnYtkH?= =?utf-8?q?nWs+6nKASjGJB3Y0T7132wFSmR/HRF7Wpl10kiOFtg3Hb2s+C++lJ/S5umcSBWCrA?= =?utf-8?q?eprKNbwac2B5ieGT9CcBhuYbz4x/U7i0/E4eMvigGYqRWEytqsejB7xol6UB+I6dc?= =?utf-8?q?yYsodcHSeIVL1iWG6i7Iu4Qq2N+pzDMDQsYgqw5fz1KZCxSPCqAakQyMkh+8G5xhj?= =?utf-8?q?4jMcUE7WoFYKYNRylFtgV2Yce8oRlBa0oKebxehjNu7tPfSqIkGEnJKaxwhigztsP?= =?utf-8?q?MBgYlRLuaMckadPnjLk4zUloXREEALYiCR3L8xx+5w8BOOqU/l2NxzgRlpXugduS1?= =?utf-8?q?SXUXzGFf6GVA4/6/u/QeWt4Pas2octI/KTI9U1SZVnhH8HWW6a+xLonZM1ih4rzi7?= =?utf-8?q?c8EwIkf8rRI9uUWzZSOG6V+qGT2/pKG2bbUZcNtuiNu7UHV1oraC5KIbBI9XOYbkM?= =?utf-8?q?LjnJp32bnJS5K3ewG/qKIV8gMPLzU5x3f+MFcKdf03fEElUCulAFfNLKUwbINQLmy?= =?utf-8?q?fKw2SdfoEWAr+FhBbvhjihWglmR7yHnKwXzCXu4Y/QVgcjJqHV94+hCcrKEh8kII+?= =?utf-8?q?14Ns+GDFRcuvESOS2j02KyfOOTfaLvdOpQHfPnK1INc9IYQw3lTga4j5eBYrOlIdp?= =?utf-8?q?QC7t9vqJasLj6cRe8vT4kehdq+f5XvhE3s/xy7tJV4YfMi1oUAjbNrCxrrZXLh1K1?= =?utf-8?q?vCm6ziPb6TbU6aGCMquA735Eeyhy86dJNOvUD5xQjv/iyDce1l9zuB295Asv/F8LU?= =?utf-8?q?bEDU6AMBHAleFySk5xSKhKBAFUuE6L2iLbvxDitpP3gt5wPgbixdfYO/Q4Wjf8YdO?= =?utf-8?q?2FWqsHFPgSffyc8Nhm9uKql37nHhig9IU2k1f1V+YnizPewFtVxI1PfHjbD1h1keJ?= =?utf-8?q?ICnNx3FpEMFelFXaHAbRsMeLUww6dBt/uWPBRTX1Rdzud09wG6xPb7/oEPE/hjX5M?= =?utf-8?q?DxdShm4Di20y21sIZcXeTzvE3NuPFvvp6ahRe5Fnc1ntkvRw0OvdETWZFpz0+OKh0?= =?utf-8?q?7pinREKQayZfa42bq4UerHI4o/Z6WB+kb+0RaR/r/9iEfTURDadF2OfIFDN6Tm/tl?= =?utf-8?q?0b3V/0QZc8xQF30NHl+sucMiHMesP8GcKxJUQH5YM49TKYIwcea00EwWcxIffhPrl?= =?utf-8?q?YVzm58KvN3aw?= 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 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-Patchwork-Original-From: Jan Beulich via Binutils From: Jan Beulich Reply-To: Jan Beulich Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755533347252715369?= X-GMAIL-MSGID: =?utf-8?q?1755533347252715369?= 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); From patchwork Fri Jan 20 09:31:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 46257 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp100872wrn; Fri, 20 Jan 2023 01:32:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXtfUPcBhxGiFafW1EwX/hRgkB4BaKBl5VbQF5lHzN+grmpiXewoSDS7Rf4UpMQVvyRIqE4F X-Received: by 2002:a05:6402:174d:b0:494:eb9:54c4 with SMTP id v13-20020a056402174d00b004940eb954c4mr13440632edx.19.1674207125291; Fri, 20 Jan 2023 01:32:05 -0800 (PST) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id w14-20020a056402268e00b0049e4243bcc1si11135301edd.493.2023.01.20.01.32.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 01:32:05 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=toCLihTL; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1A8AA3858C36 for ; Fri, 20 Jan 2023 09:32:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1A8AA3858C36 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674207124; bh=wnOmOwdZTmxMT8+gyOzzp9APGwOrbY9CDZM75yU/NFY=; h=Date:Subject:To:Cc:References:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=toCLihTLl7/jk1MPE5I56oKutxbgN/5cmcWAd2UcXEgJZzAx+fG3m2WdQQekhVNGI 1ThD+MXrAlZNHMFz8yvIlkwiPT0tXOpSxTRbex7uiGCuhE4uLAIVP9YOpnaGSmYHN0 1egRT1ek/3gDIEdZoRnxH93aHgSbY9hncIFpbPjQ= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2051.outbound.protection.outlook.com [40.107.249.51]) by sourceware.org (Postfix) with ESMTPS id 21E43385842D for ; Fri, 20 Jan 2023 09:31:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 21E43385842D ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qfwk5zbHngeJ5aLfdhSrG0p9CHughMssvpsx2R/82jqqvdBySV8LLAZeK7eCBqoMunCUAzVls8thcefomHk1g+U7ORbeWwnh7we55gK5AIck+LBQMhVn5kr+BYQkBMOY8f89b372vXQwOePvu8vFke3AkDawhL4ah53RgAVIj1QhNwTYhhXNWlAthjsTjxi9h8IzDExhlaJAySuNo/rQiEjxQsfya/cgxdCKfYvL2hs8/cv1LoO/dAxNNLpDi0kKCS3M5yqmxJ98/MzvZ5owXtu4WlREmMXzK+QNsrN0mezbC5X7HEimAG2J8LuZ/UrvXFUCHDQk32F8yPrVEn+EQg== 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=wnOmOwdZTmxMT8+gyOzzp9APGwOrbY9CDZM75yU/NFY=; b=nLxkKNWgG75oaOAuHoXZX12PpTg6yTfXZcCEaGhoonEAj5XqacMEB73J3yOT28p+OdvRAnRpeV9PzATb8NV/5w+2okNqrZ5OVMHOSTk61tD8U3VQGhzPQiaYfVVQmNnsVGb8EURcqYk8vWhPekFYQ9VG0i6rsu1tVLiIiKel03Mj/tp2D0ffY/ODfTnDOqLV/wT7opt3rfOO/7E042OvqCXyUPuZKLqwhMbFPsJp0PDiUQ3QbE7hCvdx1WOJNG7y6uI5maVQN/bPCZxX8BlRY3+8c2gD4mnE8XdqMyqJZ0hKu2WMwGILghDopHYRsaeP8mTXAQA01w95PfTAgdZrZg== 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 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:31:28 +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:31:28 +0000 Message-ID: Date: Fri, 20 Jan 2023 10:31:27 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: [PATCH 2/2] opcodes: suppress internationalization on build helper tools Content-Language: en-US To: Binutils Cc: Nick Clifton , Alan Modra References: <693ee234-169d-a576-809a-07bdc2be1ba7@suse.com> In-Reply-To: <693ee234-169d-a576-809a-07bdc2be1ba7@suse.com> X-ClientProxiedBy: FR3P281CA0147.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:95::10) 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: 3d030214-d689-4cec-70f9-08dafac91b74 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5a2HyqPCdUbWAIk0ZbY3mhljVJ+IE9G/qtDOdQot32AxHHFHUHRVjXcjrOqLiCcp1GdGPNEmQePS5geIL9HJ80ImTJ8brAVPbLdNgHObDnW9wWk0YytaM8EdHrPt9LciY7eWzUJhHBVrrVr/5rQLLRyzgBFi8NA+KEQPVfNJYgXfiCPLPypBpgbSfiK00taIewMNqyuN52FZSZ3Ht6NttgZ1leptgfxdPNEBx1TvBRyHKXx/p+yRO4v7wauClzXnMkXHoAZ2RMh+pzeNJlkBvr63bicor29JwLL4HCofwRjsVwiCdA9SPjiEdMMRRnEvWBOpl0LI4dqVStDdpJ9IHSbtQGiNksIbnJpRmRC9SdSl5vA8yffsahEBFDxo1KwNRYz/3dYvxUKWc0loo3t1BezDBsuGsgvbi5JcLjYsnAAhJJiiGf6tK8dEobqqerC3KDNNE96Ra4suZAFbFiogIcWlzWCsIqVRkSLOmLfXDWGIjb/rQLlAEqW4RNOEquXa84e+Fn+qacxRQjM9S8Npt3nDr9T6VYxlflSBMmz9D2ofp8QnDhnz7/D2ZDbd+dK2jxro15gUTdeta7X/CS/G9LeFj7xlkmvhiqYNmOqrh4wR6Mlf6taPa4Nyhz2SFU2hXPaXZTZKgpIWqIdIc985uBJV5UfnUR98+HeyMumUHFuw4i2aGV0oBmh7KkWHNCWx3UgqPu4eiWrPQXB+ofMiL+7CQSwHXsxO+N+32YQYTJNO6uE1df4CmcEDZmD08CdL 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)(54906003)(2906002)(31686004)(45980500001)(43740500002)(357404004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?P2e6RLtfjUw1s6aaV9tribDnc/QU?= =?utf-8?q?QsdSLC9SDU7g0l5NSuxmaLxwWApMeOiQ8znmm+isc116wdlLfYHmkTIlRTtFjCFwa?= =?utf-8?q?wG3XMbWY9FvypZsJ3BLVIU8G8myLL5HXHBe9/fyl1yxOSsbrvRRiNklGBFNnZFdac?= =?utf-8?q?lbilQb9uL8495nGZ3ekzN9i8WjPSWU6/5XLO1/+bEGEf4kHANYPIJTNFx9gHdTRkP?= =?utf-8?q?aPWBTyllgGRu3eZbioXgpFM+qqFzkgxNjXd2fAdCJUsXSFqZEYg8ggPPuGDoyRjmz?= =?utf-8?q?TW9px8UQoxAJR9WBqfYjaIazqKPmT+Fg4zSVPFPoX1cYVwbmSeHMxPFT6DQZRJ/gO?= =?utf-8?q?IgP9+g34Kwz+74mMS06ohMzcGYV4PtphzZjMkanyvc+wuv3G1TXzcdyvWu5lID/Ux?= =?utf-8?q?hGltqpWFKeOXtgLpQ6jTZSCKtB2Lo7HGpBDvqhLxZojfPwsyBcHPh5tUcUiRADCOh?= =?utf-8?q?dGZEX+a9BROAT7r8kllIhQcyQjUEofHV66BM588WjdKijNEGaxaPBlZaX0jXPA+QP?= =?utf-8?q?qzV6k/N91QSPbFLWdUnWYc3tYF29gn/5Ki9tNQ/adEFOduKVEU4eQRwOVH3jkizRt?= =?utf-8?q?PCdJjt6ikepMEBymsCN7bfyefV8jad6xDGHJqYvUsEX1H+VDh0IdtVZ6hoy/ikuDE?= =?utf-8?q?lWbtdYHm9AZhOZw2ZMOY7GaOMPigO6+jHfQf4IM+VfvnxjE9+SW8RDceke+dToQPL?= =?utf-8?q?um+bkrJRtnCJ+PeTKn/olxBdgLWWyPfi22jYwbDQr2fs9v1Cp3VFlP6KiRrJ8klhf?= =?utf-8?q?BqtwJYfLsMu1kXU4c3cYMLOA8M0s7i8BXclDmkpfnxsusN2x88sPlkQODs7JiD4W0?= =?utf-8?q?/EBlizTRm0azjLm+BrGhMkWpPg8QRxgjjMFU0wU+dCzw+R571awCroWR/IJx6f8gL?= =?utf-8?q?aon4bj7lDDGgZ/oWEQdzeharaR8QbXFFB+gqkC0K3DJtuspVpPe9pKiQibs9YYeuF?= =?utf-8?q?THbhD6rgMDnk8ikCwETEtFrK5uE2bBSwhsXZ4jqTFuSLXoL4kUxjQOQLauDEQw2r6?= =?utf-8?q?bbjxYg5xeKkJLDGzattF+VAWH0JTbXmvkLk/i/yJE0SRugV+lQLPSt8DBuKpL4ap5?= =?utf-8?q?y1BY7ikVjvOShc8S8xxuMCck6HTazh/598TYxXgrt/VTlGrdJRKH4Tn5o6jV62zFp?= =?utf-8?q?yH5kktBUE0fjZwycOx5pVXVBT2lr5WMPFDFUgv1u8u7paAX+C/h64UOuIvrGpefTV?= =?utf-8?q?T7xiIC73QW912ai6CBB6AhAD8ChWzckK02NQFnJkT3ioR9PqXF0lcY8tnTisMGSyg?= =?utf-8?q?IJ2kEbPyfc4fXgVy+wOr+1XQtCY2PTa3U/tkxFNv3B1Es/O+1NZSmuiNu5oqb8gpC?= =?utf-8?q?N0wjcQ3ONoS+inD+Pl96fshb+HqsSlJr+WchxJEKX96ME0eqCBRUivm4PSn4XzW8Z?= =?utf-8?q?eOgk4pSwoGjO0CnydosdbzN6YT4SewszApJ1s9C13D+CkrSAH17vIysL6u7gKpDty?= =?utf-8?q?TlIOmauMpTPi9N19ZK7H1UoLElU4tWfblW1eryUxsBnHg98YOYkK4rtgHXioM6PFI?= =?utf-8?q?31TVds/FylQt?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d030214-d689-4cec-70f9-08dafac91b74 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:31:28.3739 (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: +6pCiXziNWGLuU/E4If4Y1aeT8KzL9/wc+qIXdMYImCjiFNxziDQM4fcC8/jB2GtKtAb9Z4Lrv3rOScGqon3fw== 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 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-Patchwork-Original-From: Jan Beulich via Binutils From: Jan Beulich Reply-To: Jan Beulich Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755533410387803286?= X-GMAIL-MSGID: =?utf-8?q?1755533410387803286?= While one of the two actually having been instrumented (i386-gen.c) now has that instrumentation dropped, there's still no point in honoring such instrumentation in general (i.e. now for ia64-gen.c only), as that only leads to a waste of resources. With CFILES then being merely an alias of LIBOPCODES_CFILES, drop the former variable altogether. --- Again 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/Makefile.am +++ b/opcodes/Makefile.am @@ -277,22 +277,6 @@ LIBOPCODES_CFILES = \ dis-init.c \ disassemble.c -# C source files that correspond to .o's. -CFILES = \ - $(LIBOPCODES_CFILES) \ - aarch64-gen.c \ - i386-gen.c \ - ia64-asmtab.c \ - ia64-gen.c \ - ia64-opc-a.c \ - ia64-opc-b.c \ - ia64-opc-f.c \ - ia64-opc-i.c \ - ia64-opc-m.c \ - ia64-opc-d.c \ - s390-mkopc.c \ - z8kgen.c - ALL32_MACHINES = $(TARGET32_LIBOPCODES_CFILES:.c=.lo) ALL64_MACHINES = $(TARGET64_LIBOPCODES_CFILES:.c=.lo) @@ -341,7 +325,7 @@ stamp-lib: libopcodes.la libopcodes.a: stamp-lib ; @true -POTFILES = $(HFILES) $(CFILES) +POTFILES = $(HFILES) $(LIBOPCODES_CFILES) po/POTFILES.in: @MAINT@ Makefile for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \ && mv tmp $(srcdir)/po/POTFILES.in --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -670,23 +670,6 @@ LIBOPCODES_CFILES = \ dis-init.c \ disassemble.c - -# C source files that correspond to .o's. -CFILES = \ - $(LIBOPCODES_CFILES) \ - aarch64-gen.c \ - i386-gen.c \ - ia64-asmtab.c \ - ia64-gen.c \ - ia64-opc-a.c \ - ia64-opc-b.c \ - ia64-opc-f.c \ - ia64-opc-i.c \ - ia64-opc-m.c \ - ia64-opc-d.c \ - s390-mkopc.c \ - z8kgen.c - ALL32_MACHINES = $(TARGET32_LIBOPCODES_CFILES:.c=.lo) ALL64_MACHINES = $(TARGET64_LIBOPCODES_CFILES:.c=.lo) OFILES = @BFD_MACHINES@ @@ -706,7 +689,7 @@ EXTRA_libopcodes_la_SOURCES = $(LIBOPCOD # should be removed if everything else starts using libtool. FIXME. noinst_LIBRARIES = libopcodes.a libopcodes_a_SOURCES = -POTFILES = $(HFILES) $(CFILES) +POTFILES = $(HFILES) $(LIBOPCODES_CFILES) CLEANFILES = \ stamp-epiphany stamp-fr30 stamp-frv stamp-ip2k stamp-iq2000 stamp-lm32 \ stamp-m32c stamp-m32r stamp-mep stamp-mt stamp-or1k stamp-xstormy16 \ --- a/opcodes/po/POTFILES.in +++ b/opcodes/po/POTFILES.in @@ -4,7 +4,6 @@ aarch64-asm.h aarch64-dis-2.c aarch64-dis.c aarch64-dis.h -aarch64-gen.c aarch64-opc-2.c aarch64-opc.c aarch64-opc.h @@ -72,18 +71,9 @@ ft32-opc.c h8300-dis.c hppa-dis.c i386-dis.c -i386-gen.c i386-opc.h -ia64-asmtab.c ia64-asmtab.h ia64-dis.c -ia64-gen.c -ia64-opc-a.c -ia64-opc-b.c -ia64-opc-d.c -ia64-opc-f.c -ia64-opc-i.c -ia64-opc-m.c ia64-opc.c ia64-opc.h ip2k-asm.c @@ -191,7 +181,6 @@ rx-dis.c s12z-dis.c s12z-opc.c s390-dis.c -s390-mkopc.c s390-opc.c score-dis.c score-opc.h @@ -231,4 +220,3 @@ xtensa-dis.c z80-dis.c z8k-dis.c z8k-opc.h -z8kgen.c