From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 34D553858D20 for ; Thu, 11 Apr 2024 14:16:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 34D553858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 34D553858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712844982; cv=none; b=GDDqNy+JMjk387GMeA7t2941ZuoQvYzdJTU95m9HAbxftzwFVfgw4f4Yc6soOJD4a/bi7SzQ0lHEo9Kwh8uI2kPUy2QorJh+dPO4qjfdcZGnVIertAqoVK9frnXZRZSBr0+isMLV2qgMJ9HdYuiFxN1J/Q0uZCVPLG+pyZMPyMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712844982; c=relaxed/simple; bh=oDdEGtJZ+CXqPTPfBkrPgwnIGkBBG5Iikvv4c+EoviE=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=b2hzHU6trDtJTB8oQW7rz5eedElUiC2fN+nHmrdy0vX0YcPQu+a/gwnycfSPG3FByo40F2D+j5VVbddi84LCFZnew0RiyDbO5ifFbuLVcUXZ/axKI3H3PfoTEsMwfA2gHoWTLcUC/nshEQZvjwwye0Cw81p0mMnCL6Zn2T8mYm8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712844980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ESZ1O+mqA/8eW+ZWEQ7z5XG55eDy1D2TGtYfJH2dL04=; b=hGZQe76Rp4fP0TDkN2NwT313n+WiQ3OObx+lD8jT30Agx13nKB0kOND4bdhgCOl/hRlvUE d3JhCrxJCSwoBZW6gA1ZgPjWwIB6vEcQpKj5PxyOzo3m4aodzCcvU2tSr1tIv9neLnCB9/ li/bd1TsZ/9dnHTGw8POz3rGaTNkx/I= Received: from mail-yw1-f197.google.com (mail-yw1-f197.google.com [209.85.128.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-324-QWYoaNWqPi2VBLQZta2nUQ-1; Thu, 11 Apr 2024 10:16:18 -0400 X-MC-Unique: QWYoaNWqPi2VBLQZta2nUQ-1 Received: by mail-yw1-f197.google.com with SMTP id 00721157ae682-60a20c33f06so93654817b3.2 for ; Thu, 11 Apr 2024 07:16:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712844978; x=1713449778; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ESZ1O+mqA/8eW+ZWEQ7z5XG55eDy1D2TGtYfJH2dL04=; b=fRD3nDkPYrkrfp4EqjRND8Swcz+N7OvCbJt+zEo/LmlTvh7NAQUxsGfOs3n+3jJ3Ih x3MUgiBe85FXGxAfNK1z5rADdH6yj7jPJTJPhuVvdGqPnkwy+0IJw8ofE4RY2Uxv5jKC e6+ju90rq+QzVdrJI+fsnNwF5JxEmK0KVTUOXmHS25qQ04tY8p6aCo3BPCWZnBMm/Tgv FukDMXjx61VBGaZdvQixQr6Z+clxcaH3/DBqpDIUcQFOUORUB6YO2L+fTF8NgD43CTTb wT5ufL9GI9fHBF0C3hdlBT2E+nk/Uyh6cptMQtqjaMPQcJ/Fm16Sz4tEX0qy4zK8G8Ze vsTw== X-Forwarded-Encrypted: i=1; AJvYcCVz5/AY3J/n/w+9bZ+J7S8r64Z+NIfAh/4C3CUi/TdxY5dQt9i28ZHQ9sOErPnQIN/WO5rmpU5TMzcnj46cZ45GwRE9ao8= X-Gm-Message-State: AOJu0YxqLKTjYJtrKf/gsGceZuOXdJpJeBfygGamo8IAh+GRiwiM0cth 4c4LlYFJEQm4oK5FA86gH5tr8B9lSzhA0UU5IpGBauk8xN9/BGGrTK6DBLyQByZv9+zZARwgCpk DUa+IX8mrpZTR137kyW/CRL03J4O/+vDr1/ckeM3ppwoT2g1bt7dKVmj8lcauuClt4GYcLwwHLd CutWku0dUXkdkSQDI8SxzB9XsDZd4= X-Received: by 2002:a25:7c6:0:b0:dc6:4d0c:e9de with SMTP id 189-20020a2507c6000000b00dc64d0ce9demr5993513ybh.0.1712844978116; Thu, 11 Apr 2024 07:16:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHLphEFL8mRgbnqr7d80tUFy0G1oE9oTv+IvpRrscY6Fwu0IMCKKZHXK+mq+HjNN8niZjwSd2XswBVGi5Aoyo0= X-Received: by 2002:a25:7c6:0:b0:dc6:4d0c:e9de with SMTP id 189-20020a2507c6000000b00dc64d0ce9demr5993497ybh.0.1712844977847; Thu, 11 Apr 2024 07:16:17 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Jonathan Wakely Date: Thu, 11 Apr 2024 15:16:02 +0100 Message-ID: Subject: Re: [PATCH] libstdc++: Regenerate baseline_symbols.txt files for Linux To: Andreas Schwab Cc: Jakub Jelinek , libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-15.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,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: On Thu, 11 Apr 2024 at 15:13, Jonathan Wakely wrote: > > On Thu, 11 Apr 2024 at 15:12, Andreas Schwab wrote: > > > > On Apr 11 2024, Jakub Jelinek wrote: > > > > > --- libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt.jj 2023-05-04 09:42:43.277271065 +0200 > > > +++ libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt 2024-04-11 15:44:07.113985138 +0200 > > > @@ -3214,6 +3214,7 @@ FUNC:_ZNSt7__cxx1112basic_stringIcSt11ch > > > FUNC:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEjjPKcj@@GLIBCXX_3.4.21 > > > FUNC:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_S_compareEjj@@GLIBCXX_3.4.21 > > > FUNC:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE11_M_capacityEj@@GLIBCXX_3.4.21 > > > +FUNC:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE11_S_allocateERS3_j@@GLIBCXX_3.4.32 > > > FUNC:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_Alloc_hiderC1EPcOS3_@@GLIBCXX_3.4.23 > > > FUNC:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_Alloc_hiderC1EPcRKS3_@@GLIBCXX_3.4.21 > > > FUNC:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_Alloc_hiderC2EPcOS3_@@GLIBCXX_3.4.23 > > > @@ -3366,6 +3367,7 @@ FUNC:_ZNSt7__cxx1112basic_stringIwSt11ch > > > FUNC:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE10_M_replaceEjjPKwj@@GLIBCXX_3.4.21 > > > FUNC:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE10_S_compareEjj@@GLIBCXX_3.4.21 > > > FUNC:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE11_M_capacityEj@@GLIBCXX_3.4.21 > > > +FUNC:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE11_S_allocateERS3_j@@GLIBCXX_3.4.32 > > > FUNC:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE12_Alloc_hiderC1EPwOS3_@@GLIBCXX_3.4.23 > > > FUNC:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE12_Alloc_hiderC1EPwRKS3_@@GLIBCXX_3.4.21 > > > FUNC:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE12_Alloc_hiderC2EPwOS3_@@GLIBCXX_3.4.23 > > > > That does not fit. > > > > diff --git a/libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt b/libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt > > index 975e7e97cbf..0ac915dc01b 100644 > > --- a/libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt > > +++ b/libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt > > @@ -497,6 +497,7 @@ FUNC:_ZNKSt11__timepunctIwE7_M_daysEPPKw@@GLIBCXX_3.4 > > FUNC:_ZNKSt11__timepunctIwE8_M_am_pmEPPKw@@GLIBCXX_3.4 > > FUNC:_ZNKSt11__timepunctIwE9_M_monthsEPPKw@@GLIBCXX_3.4 > > FUNC:_ZNKSt11logic_error4whatEv@@GLIBCXX_3.4 > > +FUNC:_ZNKSt12__basic_fileIcE13native_handleEv@@GLIBCXX_3.4.32 > > That symbol should not be in this symver, see > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114692 and > https://gcc.gnu.org/pipermail/gcc-patches/2024-April/649260.html Jakub's patch is just adding the symbols from gcc-13.2.0 which should be in the baselines for both gcc-13 and trunk. After that's done I can fix PR114692 and then we can regen the baselines for trunk, which will include the __cxa_call_terminate@@CXXABI_1.3.15 symbol, but also have _ZNKSt12__basic_fileIcE13native_handleEv@@GLIBCXX_3.4.33 (N.B. 3.4.33 not 3.4.32).