From: Eric Botcazou <ebotcazou@adacore.com>
Date: Mon, 15 Sep 2025 21:02:52 +0000 (+0200)
Subject: Ada: Fix GNAT build failure for x32 multilib
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e97969e20b39f33bc3644ae8a16bd5ef1e9ef2d3;p=thirdparty%2Fgcc.git

Ada: Fix GNAT build failure for x32 multilib

gcc/ada
	PR ada/114065
	PR ada/121953
	* Makefile.rtl (LIBGNAT_TARGET_PAIRS) [x32-linux]: Replace
	libgnarl/s-osinte__x32.adb with libgnarl/s-osinte__posix.adb.
	* libgnarl/s-osinte__x32.adb: Delete.
---

diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
index 0c290794309..0fa2c51ceb6 100644
--- a/gcc/ada/Makefile.rtl
+++ b/gcc/ada/Makefile.rtl
@@ -2943,7 +2943,7 @@ ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu) $(target_os))),)
   s-intman.adb<libgnarl/s-intman__posix.adb \
   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
   s-osinte.ads<libgnarl/s-osinte__linux.ads \
-  s-osinte.adb<libgnarl/s-osinte__x32.adb \
+  s-osinte.adb<libgnarl/s-osinte__posix.adb \
   s-oslock.ads<libgnat/s-oslock__posix.ads \
   s-osprim.adb<libgnat/s-osprim__posix.adb \
   s-taprop.adb<libgnarl/s-taprop__linux.adb \
diff --git a/gcc/ada/libgnarl/s-osinte__x32.adb b/gcc/ada/libgnarl/s-osinte__x32.adb
deleted file mode 100644
index 2e6585352d3..00000000000
--- a/gcc/ada/libgnarl/s-osinte__x32.adb
+++ /dev/null
@@ -1,73 +0,0 @@
-------------------------------------------------------------------------------
---                                                                          --
---                 GNAT RUN-TIME LIBRARY (GNARL) COMPONENTS                 --
---                                                                          --
---                   S Y S T E M . O S _ I N T E R F A C E                  --
---                                                                          --
---                                   B o d y                                --
---                                                                          --
---             Copyright (C) 1991-2017, Florida State University            --
---                     Copyright (C) 1995-2025, AdaCore                     --
---                                                                          --
--- GNAT 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 version is for Linux/x32
-
---  This package encapsulates all direct interfaces to OS services
---  that are needed by children of System.
-
-with Interfaces.C;
-
-package body System.OS_Interface is
-
-   --------------------
-   -- Get_Stack_Base --
-   --------------------
-
-   function Get_Stack_Base (thread : pthread_t) return Address is
-      pragma Warnings (Off, thread);
-
-   begin
-      return Null_Address;
-   end Get_Stack_Base;
-
-   ------------------
-   -- pthread_init --
-   ------------------
-
-   procedure pthread_init is
-   begin
-      null;
-   end pthread_init;
-
-   ------------------------
-   -- To_Target_Priority --
-   ------------------------
-
-   function To_Target_Priority
-     (Prio : System.Any_Priority) return Interfaces.C.int
-   is
-   begin
-      return Interfaces.C.int (Prio);
-   end To_Target_Priority;
-
-end System.OS_Interface;