From patchwork Tue Sep 5 19:35:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 137546 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp1888859vqo; Tue, 5 Sep 2023 12:37:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IELiOFUR/wMkVw9YXBOZuwyMy89JI6kHRs1hqx/Ck2ue4LYlJFv/SVAeKUtmleeKOAnI+IK X-Received: by 2002:aa7:d953:0:b0:523:3e23:15ab with SMTP id l19-20020aa7d953000000b005233e2315abmr547799eds.26.1693942668970; Tue, 05 Sep 2023 12:37:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693942668; cv=none; d=google.com; s=arc-20160816; b=RdASUcwCVis/APeb4JXH6Zi6BjkphVOAOZk1g8bX0E9SQumlCJFGnHapvbVabXnx71 ex+ptR1P/f5FY7JD1sdXgCIfp6+UlSpInckwgmsvqFslQbnAFQqMtx1cmlbAnw+gVwne uRhKG5XGkj2k4L3q3df+VTLWU/Ocplkvou7gna/igXmjvymD8OjeTD2SpkxCS+C5jlHi TOBrjx+EMtq2GGt5XVEvF1gNRAe4Eo4F5jeJj05/R4jrkXocCpYURYbhn/ALVZ08MnNZ b+em+yJ+laQaBilsSAX02C62cq88peao5WRx1RiZKdb59qdoxa3wCmLNE6ITYGa7ltu3 1Z3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:to:subject :message-id:date:mime-version:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=U8BJasvz4sdkDBaQL1k6kp9IbDlU0cjWCdfyesQaYkQ=; fh=yAEuOrgVOBnuFQxj6uiu0Gv0z6rVERblxlha55D8TVM=; b=OMQFp6JvlHIiP0vnfQvFjLMLarolAEge6yalnUOgo4LMWKWwPkBAQXPWv2XMakazGp 4cycHhON0DHBv6XJfdawTtxQgkIVcNQkOiRiHAUHjp7Q4jgOArdZ9BgJvLn+kd8GQBZ8 xzuK13Woyak8fN8RRgg/jT9p6YkV4IzdUJ9fmcpf7Wr81evO6pC37ntNfos8eS6opkAQ 3SIbVoFaT8kKxK8iZ2ytlh2XGR9ABRpaCsdnmTqpu5iSokjRS5Tfww+uHMx/up4cAGgj JBRRe7UzKV4aTWY29zkjAtZf/GLLSkG5psHb6kkrdXXogJMmHuAMIi0iQFvPYMMm0YlB KBCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=DEP5g2Tg; 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id w20-20020a50fa94000000b0052976b32db2si8147755edr.314.2023.09.05.12.37.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 12:37:48 -0700 (PDT) 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=DEP5g2Tg; 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 1DDD33857703 for ; Tue, 5 Sep 2023 19:36:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1DDD33857703 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1693942572; bh=U8BJasvz4sdkDBaQL1k6kp9IbDlU0cjWCdfyesQaYkQ=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=DEP5g2TgRY5zoUQ4CEa6zYWEJqFmfARsWVdsBj9gNArnIZLZ7/qsJpcSfGpggz5KR UsHgloeoVzlAgAhZ/XrKm14LHwO41t8FjdZcmftowI5p/lb4lhcx93gTh/mPys/6qm hZWMIttNA1aO0CISlofu3iN1nkI4AXaMs4WhZzYc= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by sourceware.org (Postfix) with ESMTPS id CDCDC3858D32 for ; Tue, 5 Sep 2023 19:36:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CDCDC3858D32 Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-51e24210395so3690a12.0 for ; Tue, 05 Sep 2023 12:36:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693942560; x=1694547360; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=U8BJasvz4sdkDBaQL1k6kp9IbDlU0cjWCdfyesQaYkQ=; b=adAEAyLRIf64Jgl+R3CP8drTbbuhyEbVDmo4kd2sbphskMplvZUtrv3syyH8SiQ78t w+8UfdwlbX7EYshrIaWmw9qLQ/bz/Ipx2XUt30ut1wOCgcqI/glambgf6YMm4VCDpzdp xODlOkpYi46bAHu1b3u/TVSgCUp7bq9KxD7dw2hn8fM+Ap5qSaGza4xhwoYUDM+1sXwL h7Oc8J9jbmTWr+Z/1EbhDXoVt3267K47K4NCRpCixdqWyL/ZLDEvuinT+rWDUkZ8OJSz iFh2rh3dlfQHXtfXF7LGDNMjgVxy3j+kJSJ8a8O0GPama6fxL+bBsQ4nCwt9PzFDa4aT Bo7g== X-Gm-Message-State: AOJu0YxaroZfUbjOUzcQQCxQ8LzR3Mwwq9d0MvvhJrSBCg8zSqxJQ2v4 yPEogJyxDp+ZHpGvFhPsWBvCSaCKvEQ+sb1w5L3cXadF1phHr05DJhneWw== X-Received: by 2002:a50:8e5e:0:b0:51a:1ffd:10e with SMTP id 30-20020a508e5e000000b0051a1ffd010emr32664edx.3.1693942560052; Tue, 05 Sep 2023 12:36:00 -0700 (PDT) MIME-Version: 1.0 Date: Tue, 5 Sep 2023 12:35:46 -0700 Message-ID: Subject: [PATCH users/roland/gold-charnn] gold: Use char16_t, char32_t instead of uint16_t, uint32_t as character types To: Binutils X-Spam-Status: No, score=-24.8 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, ENV_AND_HDR_SPF_MATCH, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL, USER_IN_DEF_SPF_WL 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.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Roland McGrath via Binutils From: Roland McGrath Reply-To: Roland McGrath Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776227628116122848 X-GMAIL-MSGID: 1776227628116122848 The std::basic_string template type is only specified for instantiations using character types. Newer (LLVM) libc++ implementations no longer allow non-character integer types to be used. Ok for trunk? Thanks, Roland diff --git a/gold/merge.cc b/gold/merge.cc index c12efc9905e..ce31a792443 100644 --- a/gold/merge.cc +++ b/gold/merge.cc @@ -665,10 +665,10 @@ template class Output_merge_string; template -class Output_merge_string; +class Output_merge_string; template -class Output_merge_string; +class Output_merge_string; #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG) template diff --git a/gold/output.cc b/gold/output.cc index a1978eb5f32..6053e4db33d 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -29,6 +29,7 @@ #include #include #include +#include #ifdef HAVE_SYS_MMAN_H #include @@ -2706,10 +2707,10 @@ Output_section::add_merge_input_section(Relobj* object, unsigned int shndx, pomb = new Output_merge_string(addralign); break; case 2: - pomb = new Output_merge_string(addralign); + pomb = new Output_merge_string(addralign); break; case 4: - pomb = new Output_merge_string(addralign); + pomb = new Output_merge_string(addralign); break; default: return false; diff --git a/gold/stringpool.cc b/gold/stringpool.cc index a2cd44d5244..b5ac1dd34ca 100644 --- a/gold/stringpool.cc +++ b/gold/stringpool.cc @@ -25,6 +25,7 @@ #include #include #include +#include #include "output.h" #include "parameters.h" @@ -527,9 +528,9 @@ template class Stringpool_template; template -class Stringpool_template; +class Stringpool_template; template -class Stringpool_template; +class Stringpool_template; } // End namespace gold.