[PATCHv2,1/3] ada: Factorize bsd signal definitions

Message ID	20241103163716.2228976-2-samuel.thibault@ens-lyon.org
State	New
Headers	show Return-Path: <gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org> DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 84C933858D20 From: Samuel Thibault <samuel.thibault@ens-lyon.org> To: gcc-patches@gcc.gnu.org Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>, bug-hurd@gnu.org Subject: [PATCHv2 1/3] ada: Factorize bsd signal definitions Date: Sun, 3 Nov 2024 17:37:14 +0100 Message-ID: <20241103163716.2228976-2-samuel.thibault@ens-lyon.org> In-Reply-To: <20241103163716.2228976-1-samuel.thibault@ens-lyon.org> References: <20241103163716.2228976-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org
Series	ada: Add GNU/Hurd x86_64 support \| expand [PATCHv2,0/3] ada: Add GNU/Hurd x86_64 support [PATCHv2,1/3] ada: Factorize bsd signal definitions [PATCHv2,2/3] ada: Fix GNU/Hurd priority range [PATCHv2,3/3] ada: Add GNU/Hurd x86_64 support

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 31c7b677bdf..b8e89fa0c62 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,14 @@ +2024-11-03 Samuel Thibault <samuel.thibault@ens-lyon.org> + + * libgnarl/a-intnam__freebsd.ads: Rename to... + * libgnarl/a-intnam__bsd.ads: ... new file. + * libgnarl/a-intnam__dragonfly.ads: Remove file. + * Makefile.rtl (x86-kfreebsd, x86-gnuhurd, x86_64-kfreebsd, + aarch64-freebsd, x86-freebsd, x86_64-freebsd): Use + libgnarl/a-intnam__bsd.ads instead of libgnarl/a-intnam__freebsd.ads. + * ada/Makefile.rtl (x86_64-dragonfly): Use libgnarl/a-intnam__bsd.ads + instead of libgnarl/a-intnam__dragonfly.ads. + 2024-10-29 David Malcolm <dmalcolm@redhat.com> PR other/116613 diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl index a36f60170b5..c3d2e3f0e28 100644 --- a/gcc/ada/Makefile.rtl +++ b/gcc/ada/Makefile.rtl @@ -1684,7 +1684,7 @@ ifeq ($(strip $(filter-out %86 kfreebsd%,$(target_cpu) $(target_os))),) SELECTED_PAIRS=x86-kfreebsd LIBGNAT_TARGET_PAIRS = \ - a-intnam.ads<libgnarl/a-intnam__freebsd.ads \ + a-intnam.ads<libgnarl/a-intnam__bsd.ads \ s-inmaop.adb<libgnarl/s-inmaop__posix.adb \ s-intman.adb<libgnarl/s-intman__posix.adb \ s-osinte.adb<libgnarl/s-osinte__posix.adb \ @@ -1720,7 +1720,7 @@ ifeq ($(strip $(filter-out %86 pc gnu,$(target_cpu) $(target_vendor) $(target_os SELECTED_PAIRS=x86-gnuhurd LIBGNAT_TARGET_PAIRS = \ - a-intnam.ads<libgnarl/a-intnam__freebsd.ads \ + a-intnam.ads<libgnarl/a-intnam__bsd.ads \ s-inmaop.adb<libgnarl/s-inmaop__posix.adb \ s-intman.adb<libgnarl/s-intman__posix.adb \ s-osinte.adb<libgnarl/s-osinte__gnu.adb \ @@ -1753,7 +1753,7 @@ ifeq ($(strip $(filter-out x86_64 kfreebsd%,$(target_cpu) $(target_os))),) SELECTED_PAIRS=x86_64-kfreebsd LIBGNAT_TARGET_PAIRS = \ - a-intnam.ads<libgnarl/a-intnam__freebsd.ads \ + a-intnam.ads<libgnarl/a-intnam__bsd.ads \ s-inmaop.adb<libgnarl/s-inmaop__posix.adb \ s-intman.adb<libgnarl/s-intman__posix.adb \ s-osinte.adb<libgnarl/s-osinte__posix.adb \ @@ -1787,7 +1787,7 @@ ifeq ($(strip $(filter-out %aarch64 freebsd%,$(target_cpu) $(target_os))),) SELECTED_PAIRS=aarch64-freebsd LIBGNAT_TARGET_PAIRS = \ - a-intnam.ads<libgnarl/a-intnam__freebsd.ads \ + a-intnam.ads<libgnarl/a-intnam__bsd.ads \ a-nallfl.ads<libgnat/a-nallfl__wraplf.ads \ s-dorepr.adb<libgnat/s-dorepr__fma.adb \ s-inmaop.adb<libgnarl/s-inmaop__posix.adb \ @@ -1824,7 +1824,7 @@ ifeq ($(strip $(filter-out %86 freebsd%,$(target_cpu) $(target_os))),) SELECTED_PAIRS=x86-freebsd LIBGNAT_TARGET_PAIRS = \ - a-intnam.ads<libgnarl/a-intnam__freebsd.ads \ + a-intnam.ads<libgnarl/a-intnam__bsd.ads \ s-inmaop.adb<libgnarl/s-inmaop__posix.adb \ s-intman.adb<libgnarl/s-intman__posix.adb \ s-mudido.adb<libgnarl/s-mudido__affinity.adb \ @@ -1860,7 +1860,7 @@ ifeq ($(strip $(filter-out %86_64 freebsd%,$(target_cpu) $(target_os))),) SELECTED_PAIRS=x86_64-freebsd LIBGNAT_TARGET_PAIRS = \ - a-intnam.ads<libgnarl/a-intnam__freebsd.ads \ + a-intnam.ads<libgnarl/a-intnam__bsd.ads \ s-inmaop.adb<libgnarl/s-inmaop__posix.adb \ s-intman.adb<libgnarl/s-intman__posix.adb \ s-mudido.adb<libgnarl/s-mudido__affinity.adb \ @@ -1898,7 +1898,7 @@ ifeq ($(strip $(filter-out %86_64 dragonfly%,$(target_cpu) $(target_os))),) SELECTED_PAIRS=x86_64-dragonfly LIBGNAT_TARGET_PAIRS = \ - a-intnam.ads<libgnarl/a-intnam__dragonfly.ads \ + a-intnam.ads<libgnarl/a-intnam__bsd.ads \ s-inmaop.adb<libgnarl/s-inmaop__posix.adb \ s-intman.adb<libgnarl/s-intman__posix.adb \ s-mudido.adb<libgnarl/s-mudido__affinity.adb \ diff --git a/gcc/ada/libgnarl/a-intnam__freebsd.ads b/gcc/ada/libgnarl/a-intnam__bsd.ads similarity index 99% rename from gcc/ada/libgnarl/a-intnam__freebsd.ads rename to gcc/ada/libgnarl/a-intnam__bsd.ads index 3a2a1e985ed..767f54e64cc 100644 --- a/gcc/ada/libgnarl/a-intnam__freebsd.ads +++ b/gcc/ada/libgnarl/a-intnam__bsd.ads @@ -29,7 +29,7 @@ -- -- ------------------------------------------------------------------------------ --- This is the FreeBSD THREADS version of this package +-- This is the BSD THREADS version of this package with System.OS_Interface; diff --git a/gcc/ada/libgnarl/a-intnam__dragonfly.ads b/gcc/ada/libgnarl/a-intnam__dragonfly.ads deleted file mode 100644 index 21c8b9a447d..00000000000 --- a/gcc/ada/libgnarl/a-intnam__dragonfly.ads +++ /dev/null @@ -1,136 +0,0 @@ ------------------------------------------------------------------------------- --- -- --- GNAT RUN-TIME LIBRARY (GNARL) COMPONENTS -- --- -- --- A D A . I N T E R R U P T S . N A M E S -- --- -- --- S p e c -- --- -- --- Copyright (C) 1991-2024, Free Software Foundation, Inc. -- --- -- --- GNARL is free software; you can redistribute it and/or modify it under -- --- terms of the GNU General Public License as published by the Free Soft- -- --- ware Foundation; either version 3, or (at your option) any later ver- -- --- sion. GNAT is distributed in the hope that it will be useful, but WITH- -- --- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- --- or FITNESS FOR A PARTICULAR PURPOSE. -- --- -- --- As a special exception under Section 7 of GPL version 3, you are granted -- --- additional permissions described in the GCC Runtime Library Exception, -- --- version 3.1, as published by the Free Software Foundation. -- --- -- --- You should have received a copy of the GNU General Public License and -- --- a copy of the GCC Runtime Library Exception along with this program; -- --- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -- --- <http://www.gnu.org/licenses/>. -- --- -- --- GNARL was developed by the GNARL team at Florida State University. -- --- Extensive contributions were provided by Ada Core Technologies, Inc. -- --- -- ------------------------------------------------------------------------------- - --- This is the DragonFly BSD THREADS version of this package - -with System.OS_Interface; - -package Ada.Interrupts.Names is - - -- All identifiers in this unit are implementation defined - - pragma Implementation_Defined; - - -- Beware that the mapping of names to signals may be many-to-one. There - -- may be aliases. Also, for all signal names that are not supported on - -- the current system the value of the corresponding constant will be zero. - - SIGHUP : constant Interrupt_ID := - System.OS_Interface.SIGHUP; -- hangup - - SIGINT : constant Interrupt_ID := - System.OS_Interface.SIGINT; -- interrupt (rubout) - - SIGQUIT : constant Interrupt_ID := - System.OS_Interface.SIGQUIT; -- quit (ASCD FS) - - SIGILL : constant Interrupt_ID := - System.OS_Interface.SIGILL; -- illegal instruction (not reset) - - SIGTRAP : constant Interrupt_ID := - System.OS_Interface.SIGTRAP; -- trace trap (not reset) - - SIGIOT : constant Interrupt_ID := - System.OS_Interface.SIGIOT; -- IOT instruction - - SIGABRT : constant Interrupt_ID := -- used by abort, - System.OS_Interface.SIGABRT; -- replace SIGIOT in the future - - SIGFPE : constant Interrupt_ID := - System.OS_Interface.SIGFPE; -- floating point exception - - SIGKILL : constant Interrupt_ID := - System.OS_Interface.SIGKILL; -- kill (cannot be caught or ignored) - - SIGBUS : constant Interrupt_ID := - System.OS_Interface.SIGBUS; -- bus error - - SIGSEGV : constant Interrupt_ID := - System.OS_Interface.SIGSEGV; -- segmentation violation - - SIGPIPE : constant Interrupt_ID := -- write on a pipe with - System.OS_Interface.SIGPIPE; -- no one to read it - - SIGALRM : constant Interrupt_ID := - System.OS_Interface.SIGALRM; -- alarm clock - - SIGTERM : constant Interrupt_ID := - System.OS_Interface.SIGTERM; -- software termination signal from kill - - SIGURG : constant Interrupt_ID := - System.OS_Interface.SIGURG; -- urgent condition on IO channel - - SIGSTOP : constant Interrupt_ID := - System.OS_Interface.SIGSTOP; -- stop (cannot be caught or ignored) - - SIGTSTP : constant Interrupt_ID := - System.OS_Interface.SIGTSTP; -- user stop requested from tty - - SIGCONT : constant Interrupt_ID := - System.OS_Interface.SIGCONT; -- stopped process has been continued - - SIGCHLD : constant Interrupt_ID := - System.OS_Interface.SIGCHLD; -- 4.3BSD's/POSIX name for SIGCLD - - SIGCLD : constant Interrupt_ID := - System.OS_Interface.SIGCLD; -- child status change - - SIGTTIN : constant Interrupt_ID := - System.OS_Interface.SIGTTIN; -- background tty read attempted - - SIGTTOU : constant Interrupt_ID := - System.OS_Interface.SIGTTOU; -- background tty write attempted - - SIGIO : constant Interrupt_ID := -- input/output possible, - System.OS_Interface.SIGIO; -- SIGPOLL alias (Solaris) - - SIGXCPU : constant Interrupt_ID := - System.OS_Interface.SIGXCPU; -- CPU time limit exceeded - - SIGXFSZ : constant Interrupt_ID := - System.OS_Interface.SIGXFSZ; -- filesize limit exceeded - - SIGVTALRM : constant Interrupt_ID := - System.OS_Interface.SIGVTALRM; -- virtual timer expired - - SIGPROF : constant Interrupt_ID := - System.OS_Interface.SIGPROF; -- profiling timer expired - - SIGWINCH : constant Interrupt_ID := - System.OS_Interface.SIGWINCH; -- window size change - - SIGUSR1 : constant Interrupt_ID := - System.OS_Interface.SIGUSR1; -- user defined signal 1 - - SIGUSR2 : constant Interrupt_ID := - System.OS_Interface.SIGUSR2; -- user defined signal 2 - -end Ada.Interrupts.Names;

[PATCHv2,1/3] ada: Factorize bsd signal definitions

Commit Message

Patch