From patchwork Fri Jun 25 11:41:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 44020 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 5948439BDDF1 for ; Fri, 25 Jun 2021 11:42:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5948439BDDF1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1624621323; bh=fZTuZAf4ae191luYSVVTqfWSdzjD0QJQPKslsp29jtU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=u6yPrK1Ga3ylRRn1VIl1FLHkz0/Bxe2uOqNs0ZbRJ//c3mG3Gss5yjdSUUpsbk36G 2+jW/YMvVgIlBnOXkZL8mikFI42bHdJpGqbu3DQdBH2WG74Ot8cPrBq2wqXWiRF38L dFXjPY6HD1gaPm0ntik+xpPmxy0eiNYI+Hzf+3Sk= 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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 29EFB3864845 for ; Fri, 25 Jun 2021 11:41:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 29EFB3864845 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-59-C7PfgVPNO_SCji7YcUCvzQ-1; Fri, 25 Jun 2021 07:41:38 -0400 X-MC-Unique: C7PfgVPNO_SCji7YcUCvzQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDF37100A966 for ; Fri, 25 Jun 2021 11:41:37 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-228.ams2.redhat.com [10.36.112.228]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1AA235C22B for ; Fri, 25 Jun 2021 11:41:36 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH v3 0/6] Remaining librt to libc moves X-From-Line: 81bd8110956e29a2492b759257ab27fe0e80fa85 Mon Sep 17 00:00:00 2001 Message-Id: Date: Fri, 25 Jun 2021 13:41:35 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This patch reposts the remaining patches, starting at the first unreviewed patch. I followed Adhemerval's suggestions. Tested on i686-linux-gnu and x86_64-linux-gnu. Built with build-many-glibcs.py. Thanks, Florian Florian Weimer (6): Linux: Define TIMER_T_WAS_INT_COMPAT in kernel-posix-timers.h Linux: Move timer_create, timer_delete from librt to libc Linux: Move timer_getoverrun from librt to libc Linux: Move timer_gettime, __timer_gettime64 from librt to libc Linux: Move timer_settime, __timer_settime64 from librt to libc Linux: Cleanups after librt move elf/Makefile | 4 +- include/time.h | 12 ++- misc/Makefile | 6 -- nptl/Makefile | 9 --- rt/Makefile | 23 ++++-- rt/Versions | 47 ++++++------ rt/aio_misc.c | 14 ---- rt/aio_notify.c | 8 -- rt/aio_sigqueue.c | 1 - rt/librt-compat.c | 16 ++-- sysdeps/generic/aio_misc.h | 43 +++-------- sysdeps/htl/Makeconfig | 6 ++ sysdeps/nptl/Makeconfig | 1 + sysdeps/pthread/Makefile | 14 +--- sysdeps/unix/sysv/linux/Makefile | 13 ---- sysdeps/unix/sysv/linux/Versions | 33 +++++---- sysdeps/unix/sysv/linux/aarch64/libc.abilist | 10 +++ sysdeps/unix/sysv/linux/aarch64/librt.abilist | 6 +- sysdeps/unix/sysv/linux/aio_sigqueue.c | 1 - sysdeps/unix/sysv/linux/alpha/Versions | 5 -- sysdeps/unix/sysv/linux/alpha/libc.abilist | 15 ++++ sysdeps/unix/sysv/linux/alpha/librt-compat.c | 2 +- sysdeps/unix/sysv/linux/alpha/librt.abilist | 12 +-- sysdeps/unix/sysv/linux/alpha/timer_create.c | 1 - sysdeps/unix/sysv/linux/alpha/timer_delete.c | 1 - .../unix/sysv/linux/alpha/timer_getoverr.c | 1 - sysdeps/unix/sysv/linux/alpha/timer_gettime.c | 1 - sysdeps/unix/sysv/linux/alpha/timer_settime.c | 1 - .../sysv/linux/alpha/timer_t_was_int_compat.h | 19 +++++ sysdeps/unix/sysv/linux/arc/libc.abilist | 10 +++ sysdeps/unix/sysv/linux/arc/librt.abilist | 6 +- sysdeps/unix/sysv/linux/arm/be/libc.abilist | 12 +++ sysdeps/unix/sysv/linux/arm/be/librt.abilist | 8 +- sysdeps/unix/sysv/linux/arm/le/libc.abilist | 12 +++ sysdeps/unix/sysv/linux/arm/le/librt.abilist | 8 +- sysdeps/unix/sysv/linux/csky/libc.abilist | 12 +++ sysdeps/unix/sysv/linux/csky/librt.abilist | 8 +- sysdeps/unix/sysv/linux/hppa/libc.abilist | 12 +++ sysdeps/unix/sysv/linux/hppa/librt.abilist | 8 +- sysdeps/unix/sysv/linux/i386/libc.abilist | 12 +++ sysdeps/unix/sysv/linux/i386/librt.abilist | 8 +- sysdeps/unix/sysv/linux/ia64/Versions | 7 -- sysdeps/unix/sysv/linux/ia64/libc.abilist | 15 ++++ sysdeps/unix/sysv/linux/ia64/librt.abilist | 12 +-- sysdeps/unix/sysv/linux/ia64/timer_create.c | 1 - sysdeps/unix/sysv/linux/ia64/timer_delete.c | 1 - sysdeps/unix/sysv/linux/ia64/timer_getoverr.c | 1 - sysdeps/unix/sysv/linux/ia64/timer_gettime.c | 1 - sysdeps/unix/sysv/linux/ia64/timer_settime.c | 1 - .../sysv/linux/ia64/timer_t_was_int_compat.h | 19 +++++ sysdeps/unix/sysv/linux/kernel-posix-timers.h | 32 +++++--- sysdeps/unix/sysv/linux/librt-compat.c | 26 +++++++ .../sysv/linux/m68k/coldfire/libc.abilist | 12 +++ .../sysv/linux/m68k/coldfire/librt.abilist | 8 +- .../unix/sysv/linux/m68k/m680x0/libc.abilist | 12 +++ .../unix/sysv/linux/m68k/m680x0/librt.abilist | 8 +- .../sysv/linux/microblaze/be/libc.abilist | 12 +++ .../sysv/linux/microblaze/be/librt.abilist | 8 +- .../sysv/linux/microblaze/le/libc.abilist | 12 +++ .../sysv/linux/microblaze/le/librt.abilist | 8 +- .../sysv/linux/mips/mips32/fpu/libc.abilist | 12 +++ .../unix/sysv/linux/mips/mips32/librt.abilist | 8 +- .../sysv/linux/mips/mips32/nofpu/libc.abilist | 12 +++ .../sysv/linux/mips/mips64/n32/libc.abilist | 12 +++ .../sysv/linux/mips/mips64/n32/librt.abilist | 8 +- .../sysv/linux/mips/mips64/n64/libc.abilist | 10 +++ .../sysv/linux/mips/mips64/n64/librt.abilist | 6 +- sysdeps/unix/sysv/linux/nios2/libc.abilist | 12 +++ sysdeps/unix/sysv/linux/nios2/librt.abilist | 8 +- .../linux/powerpc/powerpc32/fpu/libc.abilist | 12 +++ .../linux/powerpc/powerpc32/librt.abilist | 8 +- .../powerpc/powerpc32/nofpu/libc.abilist | 12 +++ .../sysv/linux/powerpc/powerpc64/Versions | 8 -- .../linux/powerpc/powerpc64/be/libc.abilist | 15 ++++ .../linux/powerpc/powerpc64/be/librt.abilist | 12 +-- .../linux/powerpc/powerpc64/le/libc.abilist | 10 +++ .../linux/powerpc/powerpc64/le/librt.abilist | 6 +- .../linux/powerpc/powerpc64/timer_create.c | 1 - .../linux/powerpc/powerpc64/timer_delete.c | 1 - .../linux/powerpc/powerpc64/timer_getoverr.c | 1 - .../linux/powerpc/powerpc64/timer_gettime.c | 1 - .../linux/powerpc/powerpc64/timer_settime.c | 1 - .../powerpc64/timer_t_was_int_compat.h | 19 +++++ .../unix/sysv/linux/riscv/rv32/libc.abilist | 10 +++ .../unix/sysv/linux/riscv/rv32/librt.abilist | 6 +- .../unix/sysv/linux/riscv/rv64/libc.abilist | 10 +++ .../unix/sysv/linux/riscv/rv64/librt.abilist | 6 +- .../unix/sysv/linux/s390/s390-32/libc.abilist | 12 +++ .../sysv/linux/s390/s390-32/librt.abilist | 8 +- sysdeps/unix/sysv/linux/s390/s390-64/Versions | 8 -- .../unix/sysv/linux/s390/s390-64/libc.abilist | 15 ++++ .../sysv/linux/s390/s390-64/librt.abilist | 12 +-- .../sysv/linux/s390/s390-64/timer_create.c | 1 - .../sysv/linux/s390/s390-64/timer_delete.c | 1 - .../sysv/linux/s390/s390-64/timer_getoverr.c | 1 - .../sysv/linux/s390/s390-64/timer_gettime.c | 1 - .../sysv/linux/s390/s390-64/timer_settime.c | 1 - .../s390/s390-64/timer_t_was_int_compat.h | 19 +++++ sysdeps/unix/sysv/linux/sh/be/libc.abilist | 12 +++ sysdeps/unix/sysv/linux/sh/be/librt.abilist | 8 +- sysdeps/unix/sysv/linux/sh/le/libc.abilist | 12 +++ sysdeps/unix/sysv/linux/sh/le/librt.abilist | 8 +- sysdeps/unix/sysv/linux/sparc/librt-compat.c | 2 +- .../sysv/linux/sparc/sparc32/libc.abilist | 12 +++ .../sysv/linux/sparc/sparc32/librt.abilist | 8 +- .../unix/sysv/linux/sparc/sparc64/Versions | 8 -- .../sysv/linux/sparc/sparc64/libc.abilist | 15 ++++ .../sysv/linux/sparc/sparc64/librt.abilist | 12 +-- .../sysv/linux/sparc/sparc64/timer_create.c | 1 - .../sysv/linux/sparc/sparc64/timer_delete.c | 1 - .../sysv/linux/sparc/sparc64/timer_getoverr.c | 1 - .../sysv/linux/sparc/sparc64/timer_gettime.c | 1 - .../sysv/linux/sparc/sparc64/timer_settime.c | 1 - .../sparc/sparc64/timer_t_was_int_compat.h | 19 +++++ sysdeps/unix/sysv/linux/timer_create.c | 68 +++++++++++++---- sysdeps/unix/sysv/linux/timer_delete.c | 46 +++++++++--- sysdeps/unix/sysv/linux/timer_getoverr.c | 32 ++++++-- sysdeps/unix/sysv/linux/timer_gettime.c | 63 +++++++++++++--- sysdeps/unix/sysv/linux/timer_routines.c | 10 +-- sysdeps/unix/sysv/linux/timer_settime.c | 73 +++++++++++++++---- ...er_getoverr.c => timer_t_was_int_compat.h} | 26 +------ .../unix/sysv/linux/x86_64/64/libc.abilist | 15 ++++ .../unix/sysv/linux/x86_64/64/librt.abilist | 12 +-- .../linux/x86_64/64/timer_t_was_int_compat.h | 19 +++++ sysdeps/unix/sysv/linux/x86_64/Versions | 8 -- sysdeps/unix/sysv/linux/x86_64/compat-timer.h | 45 ------------ sysdeps/unix/sysv/linux/x86_64/timer_create.c | 65 ----------------- sysdeps/unix/sysv/linux/x86_64/timer_delete.c | 44 ----------- .../unix/sysv/linux/x86_64/timer_gettime.c | 41 ----------- .../unix/sysv/linux/x86_64/timer_settime.c | 44 ----------- .../unix/sysv/linux/x86_64/x32/libc.abilist | 10 +++ .../unix/sysv/linux/x86_64/x32/librt.abilist | 6 +- sysvipc/Makefile | 6 -- time/Makefile | 6 -- 134 files changed, 924 insertions(+), 779 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/alpha/timer_create.c delete mode 100644 sysdeps/unix/sysv/linux/alpha/timer_delete.c delete mode 100644 sysdeps/unix/sysv/linux/alpha/timer_getoverr.c delete mode 100644 sysdeps/unix/sysv/linux/alpha/timer_gettime.c delete mode 100644 sysdeps/unix/sysv/linux/alpha/timer_settime.c create mode 100644 sysdeps/unix/sysv/linux/alpha/timer_t_was_int_compat.h delete mode 100644 sysdeps/unix/sysv/linux/ia64/timer_create.c delete mode 100644 sysdeps/unix/sysv/linux/ia64/timer_delete.c delete mode 100644 sysdeps/unix/sysv/linux/ia64/timer_getoverr.c delete mode 100644 sysdeps/unix/sysv/linux/ia64/timer_gettime.c delete mode 100644 sysdeps/unix/sysv/linux/ia64/timer_settime.c create mode 100644 sysdeps/unix/sysv/linux/ia64/timer_t_was_int_compat.h create mode 100644 sysdeps/unix/sysv/linux/librt-compat.c delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c create mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_t_was_int_compat.h delete mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c delete mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c delete mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c delete mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c delete mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c create mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/timer_t_was_int_compat.h delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c create mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/timer_t_was_int_compat.h rename sysdeps/unix/sysv/linux/{x86_64/timer_getoverr.c => timer_t_was_int_compat.h} (54%) create mode 100644 sysdeps/unix/sysv/linux/x86_64/64/timer_t_was_int_compat.h delete mode 100644 sysdeps/unix/sysv/linux/x86_64/compat-timer.h delete mode 100644 sysdeps/unix/sysv/linux/x86_64/timer_create.c delete mode 100644 sysdeps/unix/sysv/linux/x86_64/timer_delete.c delete mode 100644 sysdeps/unix/sysv/linux/x86_64/timer_gettime.c delete mode 100644 sysdeps/unix/sysv/linux/x86_64/timer_settime.c