From patchwork Thu Feb 1 17:43:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 85162 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 B9566385B532 for ; Thu, 1 Feb 2024 17:44:00 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org 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 DABE83858C3A for ; Thu, 1 Feb 2024 17:43:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DABE83858C3A 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 DABE83858C3A 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=1706809396; cv=none; b=R+U9ljkStsZB79Wd8kZOvAcAiiQduDs1Oizy6a7vAcWheHEjiwbgnR6iBVLrWl+hzepdOBP2aN4qYPTJk0ZHxh2SNQiLWi0h8Nwyv2CBhZy5UsBX1OEFz0dKyJHOhzZaIW0KJjxQBCes8l0RHnfJ/UIVbg3nMkPbKC7jiEwP0QQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706809396; c=relaxed/simple; bh=C8amRbjAklCCSkUieVWZVaBDhtXgbJcINRgBQ3W1I7A=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=BuqOa04gcCtB8Kb9PklLtrPQczaHfy/j/OA918TJzv9QSQL/YJY+K6z6yDsMGjFQfUCDm/Z4X6cHP5ymvqjVQ4K72OVM92FIj/T5Ug6FQxmgUt/0YoPt21FqWQenWPnYBOBaFFBo3w6suu8sBzTJ2t5XmLXoWMEg0YFIj11jeAE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706809393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=nNlPpHvyEKhydkgmCeUDPI6JNwDxrp1nCnwuNyp3yWo=; b=EQifWQrE8jXvapg2mrdlT2qUP+m8gg04XiOuAufZ64wm8LBfvLUNXaCcyJikM3jbtDGaCY 7OPx6Esa+4Rg/lIRXFA4057xWbKRvjMkrEQhRUn8MSAy3jNUvzIQOq8UchHdBE2dQ4BFbg sTQSoZ7hmqRZNGQ68lCPhzD0MMAqZcU= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-596-FVlFU6q1ORWdL0p11VLEJA-1; Thu, 01 Feb 2024 12:43:11 -0500 X-MC-Unique: FVlFU6q1ORWdL0p11VLEJA-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-40ef9f4ef41so6775815e9.2 for ; Thu, 01 Feb 2024 09:43:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706809390; x=1707414190; h=mime-version:message-id:subject:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=nNlPpHvyEKhydkgmCeUDPI6JNwDxrp1nCnwuNyp3yWo=; b=bHQciQ47dO7FeGpk1f5Na9hxCO+FMWWOym63tvLF34hBebaW9U8pXQa+cS/1HfOZqd T1FVwk3FL2mTf1P4OnlPnojccJlOTEpqPE4Kk2enSr6XBkipVMETohUzyjDOhA5BzC7B 1YCTalCqx0sb6izJDyN6SDY41IzuHvtIKC/RdsBQZAI2Jr+BbO2JhrIOkc7kcmfJYQco 3BpuGN0T0XrMXjt/DceK8bVN2FkqUu7CcNJEDXG+tgPW8fMtuM06AdP/5IktpLxXocPB Su0c6OzvFrsX/kUsI1q/2oD16xbm79o74XpH3ulfNuewFPluI3acPzIKEXOhtIA0QLts CTRA== X-Gm-Message-State: AOJu0YzKUy4DDs3Y9vD5gyIda/vWTGEZ559Dhk3S/wOWyRbbsUK6QPCo anENAsDRmbyEaLUI5zGTFhyesXHhfOCuzQmoJZ0aQjuO8Vl3YvrlCOt0vMIICav9k/BdsZKpsWt r4tOWwwZPqtrWkgBMFGMV6FL662iv/tE4D3nRZw+uEZ8UNRn6xpOCfT5hLs5qO0/z+QlbC9duCr NhP0PxbC7mjX6gZkUyYUTqffUray2D/lr4FpVdtFq7Tg== X-Received: by 2002:a05:600c:4ed1:b0:40d:8550:878d with SMTP id g17-20020a05600c4ed100b0040d8550878dmr2113943wmq.15.1706809389919; Thu, 01 Feb 2024 09:43:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IES9x81BPvHEhg/TGIdoUvS63KDoTml8CDwn3PkTk9sa6VWaRDpu+0OLORVBXwj+OagJ4sd+A== X-Received: by 2002:a05:600c:4ed1:b0:40d:8550:878d with SMTP id g17-20020a05600c4ed100b0040d8550878dmr2113926wmq.15.1706809389254; Thu, 01 Feb 2024 09:43:09 -0800 (PST) Received: from digraph.polyomino.org.uk (digraph.polyomino.org.uk. [2001:8b0:bf73:93f7::51bb:e332]) by smtp.gmail.com with ESMTPSA id z12-20020a7bc7cc000000b0040efb503d58sm5022700wmk.28.2024.02.01.09.43.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 09:43:09 -0800 (PST) Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.95) (envelope-from ) id 1rVb5f-00Bjee-RQ for libc-alpha@sourceware.org; Thu, 01 Feb 2024 17:43:07 +0000 Date: Thu, 1 Feb 2024 17:43:07 +0000 (UTC) From: Joseph Myers To: libc-alpha@sourceware.org Subject: Rename c2x / gnu2x tests to c23 / gnu23 Message-ID: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Complete the internal renaming from "C2X" and related names in GCC by renaming *-c2x and *-gnu2x tests to *-c23 and *-gnu23. Tested for x86_64, and with build-many-glibcs.py for powerpc64le. diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 60a7f4cff3..6447b6b444 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -240,7 +240,7 @@ tests := \ tst-renameat2 \ tst-rndseek \ tst-scanf-binary-c11 \ - tst-scanf-binary-c2x \ + tst-scanf-binary-c23 \ tst-scanf-binary-gnu11 \ tst-scanf-binary-gnu89 \ tst-scanf-intn \ @@ -495,7 +495,7 @@ CFLAGS-tst-memstream-string.c += -fno-builtin-fprintf # the test for that version uses -std=c11 and then _ISOC23_SOURCE is defined in # the test as needed. CFLAGS-tst-scanf-binary-c11.c += -std=c11 -DOBJPFX=\"$(objpfx)\" -CFLAGS-tst-scanf-binary-c2x.c += -std=c11 -DOBJPFX=\"$(objpfx)\" +CFLAGS-tst-scanf-binary-c23.c += -std=c11 -DOBJPFX=\"$(objpfx)\" CFLAGS-tst-scanf-binary-gnu11.c += -std=gnu11 -DOBJPFX=\"$(objpfx)\" CFLAGS-tst-scanf-binary-gnu89.c += -std=gnu89 -DOBJPFX=\"$(objpfx)\" diff --git a/stdio-common/tst-scanf-binary-c2x.c b/stdio-common/tst-scanf-binary-c23.c similarity index 100% rename from stdio-common/tst-scanf-binary-c2x.c rename to stdio-common/tst-scanf-binary-c23.c diff --git a/stdlib/Makefile b/stdlib/Makefile index e9f9c7856d..8b0ac63ddb 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -337,9 +337,9 @@ tests := \ tst-strtod6 \ tst-strtol \ tst-strtol-binary-c11 \ - tst-strtol-binary-c2x \ + tst-strtol-binary-c23 \ tst-strtol-binary-gnu11 \ - tst-strtol-binary-gnu2x \ + tst-strtol-binary-gnu23 \ tst-strtol-locale \ tst-strtoll \ tst-swapcontext1 \ @@ -527,9 +527,9 @@ CFLAGS-testmb.c += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wall -Werror # (added in GCC 9), so the tests for those versions use -std=c11 and -std=gnu11 # and then _ISOC23_SOURCE is defined in the test as needed. CFLAGS-tst-strtol-binary-c11.c += -std=c11 -CFLAGS-tst-strtol-binary-c2x.c += -std=c11 +CFLAGS-tst-strtol-binary-c23.c += -std=c11 CFLAGS-tst-strtol-binary-gnu11.c += -std=gnu11 -CFLAGS-tst-strtol-binary-gnu2x.c += -std=gnu11 +CFLAGS-tst-strtol-binary-gnu23.c += -std=gnu11 # Run a test on the header files we use. diff --git a/stdlib/tst-strtol-binary-c2x.c b/stdlib/tst-strtol-binary-c23.c similarity index 100% rename from stdlib/tst-strtol-binary-c2x.c rename to stdlib/tst-strtol-binary-c23.c diff --git a/stdlib/tst-strtol-binary-gnu2x.c b/stdlib/tst-strtol-binary-gnu23.c similarity index 100% rename from stdlib/tst-strtol-binary-gnu2x.c rename to stdlib/tst-strtol-binary-gnu23.c diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile index 20cb2dbe35..910c0198eb 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile @@ -346,11 +346,11 @@ endif ifeq ($(subdir), stdio-common) tests += tst-ibm128-scanf-binary-c11 \ - tst-ibm128-scanf-binary-c2x \ + tst-ibm128-scanf-binary-c23 \ tst-ibm128-scanf-binary-gnu11 \ tst-ibm128-scanf-binary-gnu89 \ tst-ieee128-scanf-binary-c11 \ - tst-ieee128-scanf-binary-c2x \ + tst-ieee128-scanf-binary-c23 \ tst-ieee128-scanf-binary-gnu11 \ tst-ieee128-scanf-binary-gnu89 @@ -360,7 +360,7 @@ tests += tst-ibm128-scanf-binary-c11 \ # the test as needed. CFLAGS-tst-ibm128-scanf-binary-c11.c += -mabi=ibmlongdouble -Wno-psabi \ -std=c11 -DOBJPFX=\"$(objpfx)\" -CFLAGS-tst-ibm128-scanf-binary-c2x.c += -mabi=ibmlongdouble -Wno-psabi \ +CFLAGS-tst-ibm128-scanf-binary-c23.c += -mabi=ibmlongdouble -Wno-psabi \ -std=c11 -DOBJPFX=\"$(objpfx)\" CFLAGS-tst-ibm128-scanf-binary-gnu11.c += -mabi=ibmlongdouble -Wno-psabi \ -std=gnu11 -DOBJPFX=\"$(objpfx)\" @@ -369,7 +369,7 @@ CFLAGS-tst-ibm128-scanf-binary-gnu89.c += -mabi=ibmlongdouble -Wno-psabi \ CFLAGS-tst-ieee128-scanf-binary-c11.c += -mfloat128 -mabi=ieeelongdouble \ -Wno-psabi -std=c11 \ -DOBJPFX=\"$(objpfx)\" -CFLAGS-tst-ieee128-scanf-binary-c2x.c += -mfloat128 -mabi=ieeelongdouble \ +CFLAGS-tst-ieee128-scanf-binary-c23.c += -mfloat128 -mabi=ieeelongdouble \ -Wno-psabi -std=c11 \ -DOBJPFX=\"$(objpfx)\" CFLAGS-tst-ieee128-scanf-binary-gnu11.c += -mfloat128 -mabi=ieeelongdouble \ @@ -383,11 +383,11 @@ endif ifeq ($(subdir), wcsmbs) tests += tst-ibm128-wscanf-binary-c11 \ - tst-ibm128-wscanf-binary-c2x \ + tst-ibm128-wscanf-binary-c23 \ tst-ibm128-wscanf-binary-gnu11 \ tst-ibm128-wscanf-binary-gnu89 \ tst-ieee128-wscanf-binary-c11 \ - tst-ieee128-wscanf-binary-c2x \ + tst-ieee128-wscanf-binary-c23 \ tst-ieee128-wscanf-binary-gnu11 \ tst-ieee128-wscanf-binary-gnu89 @@ -397,7 +397,7 @@ tests += tst-ibm128-wscanf-binary-c11 \ # the test as needed. CFLAGS-tst-ibm128-wscanf-binary-c11.c += -mabi=ibmlongdouble -Wno-psabi \ -std=c11 -DOBJPFX=\"$(objpfx)\" -CFLAGS-tst-ibm128-wscanf-binary-c2x.c += -mabi=ibmlongdouble -Wno-psabi \ +CFLAGS-tst-ibm128-wscanf-binary-c23.c += -mabi=ibmlongdouble -Wno-psabi \ -std=c11 -DOBJPFX=\"$(objpfx)\" CFLAGS-tst-ibm128-wscanf-binary-gnu11.c += -mabi=ibmlongdouble -Wno-psabi \ -std=gnu11 -DOBJPFX=\"$(objpfx)\" @@ -406,7 +406,7 @@ CFLAGS-tst-ibm128-wscanf-binary-gnu89.c += -mabi=ibmlongdouble -Wno-psabi \ CFLAGS-tst-ieee128-wscanf-binary-c11.c += -mfloat128 -mabi=ieeelongdouble \ -Wno-psabi -std=c11 \ -DOBJPFX=\"$(objpfx)\" -CFLAGS-tst-ieee128-wscanf-binary-c2x.c += -mfloat128 -mabi=ieeelongdouble \ +CFLAGS-tst-ieee128-wscanf-binary-c23.c += -mfloat128 -mabi=ieeelongdouble \ -Wno-psabi -std=c11 \ -DOBJPFX=\"$(objpfx)\" CFLAGS-tst-ieee128-wscanf-binary-gnu11.c += -mfloat128 -mabi=ieeelongdouble \ diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c23.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c23.c new file mode 100644 index 0000000000..982d33557e --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c23.c @@ -0,0 +1,2 @@ +#define STDX "ibm128-" +#include diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c2x.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c2x.c deleted file mode 100644 index f8bb2e4be3..0000000000 --- a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c2x.c +++ /dev/null @@ -1,2 +0,0 @@ -#define STDX "ibm128-" -#include diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c23.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c23.c new file mode 100644 index 0000000000..594afd51e9 --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c23.c @@ -0,0 +1,2 @@ +#define STDX "ibm128-" +#include diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c2x.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c2x.c deleted file mode 100644 index bf0c3da75e..0000000000 --- a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c2x.c +++ /dev/null @@ -1,2 +0,0 @@ -#define STDX "ibm128-" -#include diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c23.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c23.c new file mode 100644 index 0000000000..ce25ef0802 --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c23.c @@ -0,0 +1,2 @@ +#define STDX "ieee128-" +#include diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c2x.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c2x.c deleted file mode 100644 index d09c21394c..0000000000 --- a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c2x.c +++ /dev/null @@ -1,2 +0,0 @@ -#define STDX "ieee128-" -#include diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c23.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c23.c new file mode 100644 index 0000000000..c0b52338c0 --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c23.c @@ -0,0 +1,2 @@ +#define STDX "ieee128-" +#include diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c2x.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c2x.c deleted file mode 100644 index 7e2d27c6d2..0000000000 --- a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c2x.c +++ /dev/null @@ -1,2 +0,0 @@ -#define STDX "ieee128-" -#include diff --git a/sysdeps/ieee754/ldbl-opt/Makefile b/sysdeps/ieee754/ldbl-opt/Makefile index f20c267081..74788ac999 100644 --- a/sysdeps/ieee754/ldbl-opt/Makefile +++ b/sysdeps/ieee754/ldbl-opt/Makefile @@ -232,7 +232,7 @@ endif ifeq ($(subdir), stdio-common) tests += tst-nldbl-scanf-binary-c11 \ - tst-nldbl-scanf-binary-c2x \ + tst-nldbl-scanf-binary-c23 \ tst-nldbl-scanf-binary-gnu11 \ tst-nldbl-scanf-binary-gnu89 @@ -242,7 +242,7 @@ tests += tst-nldbl-scanf-binary-c11 \ # the test as needed. CFLAGS-tst-nldbl-scanf-binary-c11.c += -mlong-double-64 -std=c11 \ -DOBJPFX=\"$(objpfx)\" -CFLAGS-tst-nldbl-scanf-binary-c2x.c += -mlong-double-64 -std=c11 \ +CFLAGS-tst-nldbl-scanf-binary-c23.c += -mlong-double-64 -std=c11 \ -DOBJPFX=\"$(objpfx)\" CFLAGS-tst-nldbl-scanf-binary-gnu11.c += -mlong-double-64 -std=gnu11 \ -DOBJPFX=\"$(objpfx)\" @@ -253,7 +253,7 @@ endif ifeq ($(subdir), wcsmbs) tests += tst-nldbl-wscanf-binary-c11 \ - tst-nldbl-wscanf-binary-c2x \ + tst-nldbl-wscanf-binary-c23 \ tst-nldbl-wscanf-binary-gnu11 \ tst-nldbl-wscanf-binary-gnu89 @@ -263,7 +263,7 @@ tests += tst-nldbl-wscanf-binary-c11 \ # the test as needed. CFLAGS-tst-nldbl-wscanf-binary-c11.c += -mlong-double-64 -std=c11 \ -DOBJPFX=\"$(objpfx)\" -CFLAGS-tst-nldbl-wscanf-binary-c2x.c += -mlong-double-64 -std=c11 \ +CFLAGS-tst-nldbl-wscanf-binary-c23.c += -mlong-double-64 -std=c11 \ -DOBJPFX=\"$(objpfx)\" CFLAGS-tst-nldbl-wscanf-binary-gnu11.c += -mlong-double-64 -std=gnu11 \ -DOBJPFX=\"$(objpfx)\" diff --git a/sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c23.c b/sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c23.c new file mode 100644 index 0000000000..f30d9501f8 --- /dev/null +++ b/sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c23.c @@ -0,0 +1,2 @@ +#define STDX "nldbl-" +#include diff --git a/sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c2x.c b/sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c2x.c deleted file mode 100644 index 4e0cf7570f..0000000000 --- a/sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c2x.c +++ /dev/null @@ -1,2 +0,0 @@ -#define STDX "nldbl-" -#include diff --git a/sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c23.c b/sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c23.c new file mode 100644 index 0000000000..0fd61276d1 --- /dev/null +++ b/sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c23.c @@ -0,0 +1,2 @@ +#define STDX "nldbl-" +#include diff --git a/sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c2x.c b/sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c2x.c deleted file mode 100644 index 7637aab0d4..0000000000 --- a/sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c2x.c +++ /dev/null @@ -1,2 +0,0 @@ -#define STDX "nldbl-" -#include diff --git a/sysdeps/powerpc/powerpc64/le/Makefile b/sysdeps/powerpc/powerpc64/le/Makefile index 5214eb40ad..9d568d4f44 100644 --- a/sysdeps/powerpc/powerpc64/le/Makefile +++ b/sysdeps/powerpc/powerpc64/le/Makefile @@ -161,7 +161,7 @@ CFLAGS-printf_size.c = $(type-float128-CFLAGS) #Older GCC (<10) doesn't like -mabi=ieeelongdouble and -mlong-double-64. $(foreach suf,$(all-object-suffixes),\ $(objpfx)tst-nldbl-scanf-binary-c11$(suf) \ - $(objpfx)tst-nldbl-scanf-binary-c2x$(suf) \ + $(objpfx)tst-nldbl-scanf-binary-c23$(suf) \ $(objpfx)tst-nldbl-scanf-binary-gnu11$(suf) \ $(objpfx)tst-nldbl-scanf-binary-gnu89$(suf) \ ): sysdep-CFLAGS := $(filter-out -mabi=ieeelongdouble,$(sysdep-CFLAGS)) @@ -171,7 +171,7 @@ endif ifeq ($(subdir), wcsmbs) $(foreach suf,$(all-object-suffixes),\ $(objpfx)tst-nldbl-wscanf-binary-c11$(suf) \ - $(objpfx)tst-nldbl-wscanf-binary-c2x$(suf) \ + $(objpfx)tst-nldbl-wscanf-binary-c23$(suf) \ $(objpfx)tst-nldbl-wscanf-binary-gnu11$(suf) \ $(objpfx)tst-nldbl-wscanf-binary-gnu89$(suf) \ ): sysdep-CFLAGS := $(filter-out -mabi=ieeelongdouble,$(sysdep-CFLAGS)) diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index b64a5e1ce5..f3333c6a4b 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -188,14 +188,14 @@ tests := \ tst-wcstod-round \ tst-wcstof \ tst-wcstol-binary-c11 \ - tst-wcstol-binary-c2x \ + tst-wcstol-binary-c23 \ tst-wcstol-binary-gnu11 \ - tst-wcstol-binary-gnu2x \ + tst-wcstol-binary-gnu23 \ tst-wcstol-locale \ tst-wprintf-binary \ tst-wprintf-intn \ tst-wscanf-binary-c11 \ - tst-wscanf-binary-c2x \ + tst-wscanf-binary-c23 \ tst-wscanf-binary-gnu11 \ tst-wscanf-binary-gnu89 \ tst-wscanf-intn \ @@ -290,10 +290,10 @@ $(objpfx)tst-wcstod-nan-sign: $(libm) # (added in GCC 9), so the tests for those versions use -std=c11 and -std=gnu11 # and then _ISOC23_SOURCE is defined in the test as needed. CFLAGS-tst-wcstol-binary-c11.c += -std=c11 -CFLAGS-tst-wcstol-binary-c2x.c += -std=c11 +CFLAGS-tst-wcstol-binary-c23.c += -std=c11 CFLAGS-tst-wcstol-binary-gnu11.c += -std=gnu11 -CFLAGS-tst-wcstol-binary-gnu2x.c += -std=gnu11 +CFLAGS-tst-wcstol-binary-gnu23.c += -std=gnu11 CFLAGS-tst-wscanf-binary-c11.c += -std=c11 -DOBJPFX=\"$(objpfx)\" -CFLAGS-tst-wscanf-binary-c2x.c += -std=c11 -DOBJPFX=\"$(objpfx)\" +CFLAGS-tst-wscanf-binary-c23.c += -std=c11 -DOBJPFX=\"$(objpfx)\" CFLAGS-tst-wscanf-binary-gnu11.c += -std=gnu11 -DOBJPFX=\"$(objpfx)\" CFLAGS-tst-wscanf-binary-gnu89.c += -std=gnu89 -DOBJPFX=\"$(objpfx)\" diff --git a/wcsmbs/tst-wcstol-binary-c2x.c b/wcsmbs/tst-wcstol-binary-c23.c similarity index 100% rename from wcsmbs/tst-wcstol-binary-c2x.c rename to wcsmbs/tst-wcstol-binary-c23.c diff --git a/wcsmbs/tst-wcstol-binary-gnu2x.c b/wcsmbs/tst-wcstol-binary-gnu23.c similarity index 100% rename from wcsmbs/tst-wcstol-binary-gnu2x.c rename to wcsmbs/tst-wcstol-binary-gnu23.c diff --git a/wcsmbs/tst-wscanf-binary-c2x.c b/wcsmbs/tst-wscanf-binary-c23.c similarity index 100% rename from wcsmbs/tst-wscanf-binary-c2x.c rename to wcsmbs/tst-wscanf-binary-c23.c