From patchwork Tue Sep 27 10:36:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 58071 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C5EF63858C62 for ; Tue, 27 Sep 2022 10:36:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C5EF63858C62 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664275017; bh=HXJ0hVrP72lriXeO4QVmvUUI/TI2hXbOKrUjlipE7CA=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=c18wo+jkZdIFNIYT181H0ffbr8/mmIojMxMEqCbqLQ66XB5+9jPv4ORNRAzSKUk3q xniQJYp1yYwVBWgsGsCAWAVU5Siq5n3iKkTiqu3EdBAU2hg6NHaeAZU6Ylpb+bSaO5 wwcMVZY90c3FvkWaNOlt4Kx0ReqN3BlRdHTyi5Bg= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 376A33857826 for ; Tue, 27 Sep 2022 10:36:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 376A33857826 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-43-ywaro2gpPXKYvVdM-OpQXA-1; Tue, 27 Sep 2022 06:36:20 -0400 X-MC-Unique: ywaro2gpPXKYvVdM-OpQXA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1CCD6299E751; Tue, 27 Sep 2022 10:36:20 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.194]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CF07718EB3; Tue, 27 Sep 2022 10:36:19 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 28RAaHET3825076 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 27 Sep 2022 12:36:17 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 28RAaGG33825075; Tue, 27 Sep 2022 12:36:16 +0200 Date: Tue, 27 Sep 2022 12:36:16 +0200 To: gcc-patches@gcc.gnu.org, Bruce Korb Subject: [committed] fixincludes: FIx up for Debian/Ubuntu includes Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jakub Jelinek via Gcc-patches From: Jakub Jelinek Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi! As reported by Tobias, my C++ _Float{16,32,64,128,32x,64x,128x} support patch broke Debian/Ubuntu bootstraps. The problem is that there glibc bits/floatn.h and bits/floatn-common.h isn't in /usr/include/ directly, but in a subdirectory like /usr/include/x86_64-linux-gnu/ Seems other fixinclude rules for bits/* headers use files = bits/whatever.h, "*/bits/whatever.h"; so this patch just follows the suit. Lightly tested on x86_64-linux (Fedora) and Tobias has tested it on Ubuntu, committed to trunk as obvious to unbreak build for those using Debian/Ubuntu. 2022-06-27 Jakub Jelinek * inclhack.def (glibc_cxx_floatn_1, glibc_cxx_floatn_2, glibc_cxx_floatn_3): Add to files also "*/bits/floatn.h" and "*/bits/floatn-common.h". * fixincl.x: Regenerated. Jakub --- fixincludes/inclhack.def.jj 2022-09-27 08:03:27.183981867 +0200 +++ fixincludes/inclhack.def 2022-09-27 12:21:34.215129010 +0200 @@ -2021,7 +2021,7 @@ fix = { */ fix = { hackname = glibc_cxx_floatn_1; - files = bits/floatn.h, bits/floatn-common.h; + files = bits/floatn.h, bits/floatn-common.h, "*/bits/floatn.h", "*/bits/floatn-common.h"; select = "^([ \t]*#[ \t]*if !__GNUC_PREREQ \\(7, 0\\) \\|\\| )defined __cplusplus\n" "(([ \t]*/\\*[^\n]*\\*/\n)?" "([ \t]*#[ \t]*if[^\n]*\n)?" @@ -2059,7 +2059,7 @@ fix = { fix = { hackname = glibc_cxx_floatn_2; - files = bits/floatn.h, bits/floatn-common.h; + files = bits/floatn.h, bits/floatn-common.h, "*/bits/floatn.h", "*/bits/floatn-common.h"; select = "^([ \t]*#[ \t]*if !__GNUC_PREREQ \\(7, 0\\) \\|\\| )defined __cplusplus\n" "(([ \t]*/\\*[^\n]*\\*/\n)?" "[ \t]*typedef[ \t]+[^\n]*[ \t]+_Float(16|32|64|128)x?([ \t]+__attribute__ \\(\\(__mode__ \\(__HF__\\)\\)\\))?;)"; @@ -2077,7 +2077,7 @@ fix = { fix = { hackname = glibc_cxx_floatn_3; - files = bits/floatn.h, bits/floatn-common.h; + files = bits/floatn.h, bits/floatn-common.h, "*/bits/floatn.h", "*/bits/floatn-common.h"; select = "^([ \t]*#[ \t]*if !__GNUC_PREREQ \\(7, 0\\) \\|\\| )defined __cplusplus\n" "(([ \t]*/\\*[^\n]*\n?[^\n]*\\*/\n)?" "([ \t]*#[ \t]*if[^\n]*\n)?" --- fixincludes/fixincl.x.jj 2022-09-27 08:03:27.189981786 +0200 +++ fixincludes/fixincl.x 2022-09-27 12:21:44.813904865 +0200 @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed September 27, 2022 at 12:49:21 AM by AutoGen 5.18.16 + * It has been AutoGen-ed September 27, 2022 at 12:21:44 PM by AutoGen 5.18.16 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Sep 27 00:49:21 CEST 2022 +/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Sep 27 12:21:44 CEST 2022 * * You must regenerate it. Use the ./genfixes script. * @@ -4116,7 +4116,7 @@ tSCC zGlibc_Cxx_Floatn_1Name[] = * File name selection pattern */ tSCC zGlibc_Cxx_Floatn_1List[] = - "bits/floatn.h\0bits/floatn-common.h\0"; + "bits/floatn.h\0bits/floatn-common.h\0*/bits/floatn.h\0*/bits/floatn-common.h\0"; /* * Machine/OS name selection pattern */ @@ -4157,7 +4157,7 @@ tSCC zGlibc_Cxx_Floatn_2Name[] = * File name selection pattern */ tSCC zGlibc_Cxx_Floatn_2List[] = - "bits/floatn.h\0bits/floatn-common.h\0"; + "bits/floatn.h\0bits/floatn-common.h\0*/bits/floatn.h\0*/bits/floatn-common.h\0"; /* * Machine/OS name selection pattern */ @@ -4197,7 +4197,7 @@ tSCC zGlibc_Cxx_Floatn_3Name[] = * File name selection pattern */ tSCC zGlibc_Cxx_Floatn_3List[] = - "bits/floatn.h\0bits/floatn-common.h\0"; + "bits/floatn.h\0bits/floatn-common.h\0*/bits/floatn.h\0*/bits/floatn-common.h\0"; /* * Machine/OS name selection pattern */