From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=google.com Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-51e24210395so3690a12.0 for ; Tue, 05 Sep 2023 12:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1693942560; x=1694547360; darn=sourceware.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=U8BJasvz4sdkDBaQL1k6kp9IbDlU0cjWCdfyesQaYkQ=; b=rj85WfQ00egMbehOFEUedNCO2nr85ah4ofOWnbIm1lTt0phii+2bZLHTVpOKGRasZw cx4fYqfNJTFdP3eBoUpi5WKn5+V7jYt6pKjyfP/4ZmwSL+Aq/ZSd7wv+kV77kHOL5DNE fjCcZYTnJWOcnnV/il2nv60w9LmTX3WbcU6DdVJIdu+QBWBlvfz5b7XiO538I2/dro0X M+oT+gsuvCgKZ9HRoi+yZLUzW/JuDK5iaEDan6tTyGq2jAM0sDAHWbBVq0k9aPiVd2Sy 7Iw26YxPnORQBps9vXJK/MqAShihpJDD3CpyhrF3nnPULG4FOJ/YAlnPv9bl0/MMX7+q kuOg== 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-Google-Smtp-Source: AGHT+IF8XS4CcEnzBXfjA76mQwcUEKL88cDfo/7wcuy0DUfV7fNVLQr/QuFT5SPiVT0UdL5rUUZwO4LPKaRkVPx0nrA= 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 From: Roland McGrath 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 Content-Type: text/plain; charset="UTF-8" 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 List-Id: 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.