This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
PATCH: Handle O32 and N64 libgnat multilibs on IRIX 6
- From: Rainer Orth <ro at techfak dot uni-bielefeld dot de>
- To: gcc-patches at gcc dot gnu dot org
- Cc: Arnaud Charlet <charlet at adacore dot com>
- Date: Fri, 7 Nov 2008 17:05:27 +0100 (MET)
- Subject: PATCH: Handle O32 and N64 libgnat multilibs on IRIX 6
Another platform that suffers from the introduction of Ada multilib support
is mips-sgi-irix6.5: without explicit multilib support or a fix for PR
bootstrap/37704, Ada bootstrap is broken. The following patch fixes this.
Testsuite results are mixed, and testing for the N64 ABI suffered from two
issues: some ACATS tests hang. Since there is still no timeout mechanism,
I had to manually kill the affected tests. Unfortunately, kill -TERM
didn't help and kill -KILL caused the shell running run_all.sh to finish
and thus the testsuite run to abort. This may be a problem specific to
IRIX 6 /bin/sh, but unfortunately run_all.sh is always run by /bin/sh, not
by $SHELL as used during configure. I'll probably submit a separate patch
for this one.
Anyway, here are the testsuite results for the different ABIs:
N32 (default):
=== acats Summary ===
# of expected passes 2294
# of unexpected failures 21
*** FAILURES: cd1c04e cxg2001 cxg2002 cxg2003 cxg2004 cxg2005 cxg2006 cxg2007 cxg2010 cxg2011 cxg2012 cxg2013 cxg2014 cxg2015 cxg2016 cxg2017 cxg2018 cxg2019 cxg2020 cxg2021 cxg2024
=== gnat Summary for unix ===
# of expected passes 580
# of unexpected failures 4
# of expected failures 6
O32:
=== acats Summary ===
# of expected passes 2313
# of unexpected failures 2
*** FAILURES: c41328a cd1c04e
=== gnat Summary ===
# of expected passes 581
# of unexpected failures 3
# of expected failures 6
N64:
=== acats Summary ===
# of expected passes 2275
# of unexpected failures 38
*** FAILURES: c940016 c94007a c94007b c954025 c954026 c960001 c97112a c97120a c97201b c97301a c97301b c97301c c97301d c97301e c97305d c9a011b cb4013a cd1c04e cxg2001 cxg2002 cxg2003 cxg2004 cxg2005 cxg2006 cxg2007 cxg2010 cxg2011 cxg2012 cxg2013 cxg2014 cxg2015 cxg2016 cxg2017 cxg2018 cxg2019 cxg2020 cxg2021 cxg2024
=== gnat Summary ===
# of expected passes 584
# of expected failures 6
The N64 ACATS results are clearly not stellar, but at least this is
progress from a bootstrap failure.
Ok for mainline?
Rainer
-----------------------------------------------------------------------------
Rainer Orth, Faculty of Technology, Bielefeld University
Wed Oct 29 23:36:14 2008 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* system-irix-n64.ads: New file.
* gcc-interface/Makefile.in (mips-sgi-irix6*): Support O32 and N64
multilibs.
Index: system-irix-n64.ads
===================================================================
--- system-irix-n64.ads (revision 0)
+++ system-irix-n64.ads (revision 0)
@@ -0,0 +1,162 @@
+------------------------------------------------------------------------------
+-- --
+-- GNAT RUN-TIME COMPONENTS --
+-- --
+-- S Y S T E M --
+-- --
+-- S p e c --
+-- (SGI Irix, n64 ABI) --
+-- --
+-- Copyright (C) 1992-2008, Free Software Foundation, Inc. --
+-- --
+-- This specification is derived from the Ada Reference Manual for use with --
+-- GNAT. The copyright notice above, and the license provisions that follow --
+-- apply solely to the contents of the part following the private keyword. --
+-- --
+-- 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 2, 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. See the GNU General Public License --
+-- for more details. You should have received a copy of the GNU General --
+-- Public License distributed with GNAT; see file COPYING. If not, write --
+-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
+-- Boston, MA 02110-1301, USA. --
+-- --
+-- As a special exception, if other files instantiate generics from this --
+-- unit, or you link this unit with other files to produce an executable, --
+-- this unit does not by itself cause the resulting executable to be --
+-- covered by the GNU General Public License. This exception does not --
+-- however invalidate any other reasons why the executable file might be --
+-- covered by the GNU Public License. --
+-- --
+-- GNAT was originally developed by the GNAT team at New York University. --
+-- Extensive contributions were provided by Ada Core Technologies Inc. --
+-- --
+------------------------------------------------------------------------------
+
+package System is
+ pragma Pure;
+ -- Note that we take advantage of the implementation permission to make
+ -- this unit Pure instead of Preelaborable; see RM 13.7.1(15). In Ada
+ -- 2005, this is Pure in any case (AI-362).
+
+ type Name is (SYSTEM_NAME_GNAT);
+ System_Name : constant Name := SYSTEM_NAME_GNAT;
+
+ -- System-Dependent Named Numbers
+
+ Min_Int : constant := Long_Long_Integer'First;
+ Max_Int : constant := Long_Long_Integer'Last;
+
+ Max_Binary_Modulus : constant := 2 ** Long_Long_Integer'Size;
+ Max_Nonbinary_Modulus : constant := 2 ** Integer'Size - 1;
+
+ Max_Base_Digits : constant := Long_Long_Float'Digits;
+ Max_Digits : constant := Long_Long_Float'Digits;
+
+ Max_Mantissa : constant := 63;
+ Fine_Delta : constant := 2.0 ** (-Max_Mantissa);
+
+ Tick : constant := 0.01;
+
+ -- Storage-related Declarations
+
+ type Address is private;
+ pragma Preelaborable_Initialization (Address);
+ Null_Address : constant Address;
+
+ Storage_Unit : constant := 8;
+ Word_Size : constant := 64;
+ Memory_Size : constant := 2 ** 64;
+
+ -- Address comparison
+
+ function "<" (Left, Right : Address) return Boolean;
+ function "<=" (Left, Right : Address) return Boolean;
+ function ">" (Left, Right : Address) return Boolean;
+ function ">=" (Left, Right : Address) return Boolean;
+ function "=" (Left, Right : Address) return Boolean;
+
+ pragma Import (Intrinsic, "<");
+ pragma Import (Intrinsic, "<=");
+ pragma Import (Intrinsic, ">");
+ pragma Import (Intrinsic, ">=");
+ pragma Import (Intrinsic, "=");
+
+ -- Other System-Dependent Declarations
+
+ type Bit_Order is (High_Order_First, Low_Order_First);
+ Default_Bit_Order : constant Bit_Order := High_Order_First;
+ pragma Warnings (Off, Default_Bit_Order); -- kill constant condition warning
+
+ -- Priority-related Declarations (RM D.1)
+
+ -- IRIX priorities as defined by realtime(5):
+ --
+ -- 255 is for system-level interrupts
+ -- 240 - 254 are suggested for hard real-time threads
+ -- 200 - 239 are used by system device driver interrupt threads
+ -- 110 - 199 are suggested for interactive real-time applications
+ -- 90 - 109 are used by system daemon threads
+ -- 0 - 89 are suggested for soft real-time applications
+ --
+ -- We don't express the full range of IRIX priorities. For now, we
+ -- handle only the subset for soft real-time applications.
+
+ Max_Priority : constant Positive := 88;
+ Max_Interrupt_Priority : constant Positive := 89;
+
+ subtype Any_Priority is Integer range 0 .. 89;
+ subtype Priority is Any_Priority range 0 .. 88;
+ subtype Interrupt_Priority is Any_Priority range 89 .. 89;
+
+ Default_Priority : constant Priority := 44;
+
+private
+
+ type Address is mod Memory_Size;
+ Null_Address : constant Address := 0;
+
+ --------------------------------------
+ -- System Implementation Parameters --
+ --------------------------------------
+
+ -- These parameters provide information about the target that is used
+ -- by the compiler. They are in the private part of System, where they
+ -- can be accessed using the special circuitry in the Targparm unit
+ -- whose source should be consulted for more detailed descriptions
+ -- of the individual switch values.
+
+ Backend_Divide_Checks : constant Boolean := False;
+ Backend_Overflow_Checks : constant Boolean := False;
+ Command_Line_Args : constant Boolean := True;
+ Configurable_Run_Time : constant Boolean := False;
+ Denorm : constant Boolean := False;
+ Duration_32_Bits : constant Boolean := False;
+ Exit_Status_Supported : constant Boolean := True;
+ Fractional_Fixed_Ops : constant Boolean := False;
+ Frontend_Layout : constant Boolean := False;
+ Machine_Overflows : constant Boolean := False;
+ Machine_Rounds : constant Boolean := True;
+ Preallocated_Stacks : constant Boolean := False;
+ Signed_Zeros : constant Boolean := True;
+ Stack_Check_Default : constant Boolean := False;
+ Stack_Check_Probes : constant Boolean := True;
+ Stack_Check_Limits : constant Boolean := False;
+ Support_64_Bit_Divides : constant Boolean := True;
+ Support_Aggregates : constant Boolean := True;
+ Support_Composite_Assign : constant Boolean := True;
+ Support_Composite_Compare : constant Boolean := True;
+ Support_Long_Shifts : constant Boolean := True;
+ Always_Compatible_Rep : constant Boolean := True;
+ Suppress_Standard_Library : constant Boolean := False;
+ Use_Ada_Main_Program_Name : constant Boolean := False;
+ ZCX_By_Default : constant Boolean := True;
+ GCC_ZCX_Support : constant Boolean := True;
+
+ -- Note: Denorm is False because denormals are not supported on the
+ -- R10000, and we want the code to be valid for this processor.
+
+end System;
Index: gcc-interface/Makefile.in
===================================================================
--- gcc-interface/Makefile.in (revision 141412)
+++ gcc-interface/Makefile.in (working copy)
@@ -1021,8 +1018,20 @@ ifeq ($(strip $(filter-out mips sgi irix
s-tasinf.ads<s-tasinf-irix.ads \
s-taspri.ads<s-taspri-posix.ads \
s-tpopsp.adb<s-tpopsp-posix.adb \
- s-traceb.adb<s-traceb-mastop.adb \
- system.ads<system-irix-n32.ads
+ s-traceb.adb<s-traceb-mastop.adb
+
+ ifeq ($(strip $(MULTISUBDIR)),/64)
+ LIBGNAT_TARGET_PAIRS += \
+ system.ads<system-irix-n64.ads
+ else
+ ifeq ($(strip $(MULTISUBDIR)),/32)
+ LIBGNAT_TARGET_PAIRS += \
+ system.ads<system-irix-o32.ads
+ else
+ LIBGNAT_TARGET_PAIRS += \
+ system.ads<system-irix-n32.ads
+ endif
+ endif
THREADSLIB = -lpthread
GNATLIB_SHARED = gnatlib-shared-default