* config/rs6000/t-aix43 (BOOT_LDFLAGS): Define.

[pf3gnuchains/gcc-fork.git] / gcc / ada / comperr.adb

diff --git a/gcc/ada/comperr.adb b/gcc/ada/comperr.adb
index ecc0f85..1725890 100644 (file)
--- a/gcc/ada/comperr.adb
+++ b/gcc/ada/comperr.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2003 Free Software Foundation, Inc.          --
+--          Copyright (C) 1992-2004 Free Software Foundation, Inc.          --
 --                                                                          --
 -- 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- --
@@ -80,12 +80,6 @@ package body Comperr is
       --  the FSF version of GNAT, but there are specializations for
       --  the GNATPRO and Public releases by Ada Core Technologies.
 
-      Public_Version  : constant Boolean := Gnat_Version_Type = "PUBLIC ";
-      --  Set True for the public version of GNAT
-
-      GNATPRO_Version : constant Boolean := Gnat_Version_Type = "GNATPRO";
-      --  Set True for the GNATPRO version of GNAT
-
       procedure End_Line;
       --  Add blanks up to column 76, and then a final vertical bar
 
@@ -99,6 +93,10 @@ package body Comperr is
          Write_Eol;
       end End_Line;
 
+      Is_Public_Version : constant Boolean := Get_Gnat_Build_Type = Public;
+      Is_FSF_Version    : constant Boolean := Get_Gnat_Build_Type = FSF;
+      Is_GAP_Version    : constant Boolean := Get_Gnat_Build_Type = GAP;
+
    --  Start of processing for Compiler_Abort
 
    begin
@@ -264,7 +262,13 @@ package body Comperr is
             --  Otherwise we use the standard fixed text
 
             else
-               if Public_Version or GNATPRO_Version then
+               if Is_FSF_Version then
+                  Write_Str
+                    ("| Please submit a bug report; see" &
+                     " http://gcc.gnu.org/bugs.html.");
+                  End_Line;
+
+               else
                   Write_Str
                     ("| Please submit bug report by email " &
                      "to report@gnat.com.");
@@ -274,15 +278,9 @@ package body Comperr is
                     ("| Use a subject line meaningful to you" &
                      " and us to track the bug.");
                   End_Line;
-
-               else
-                  Write_Str
-                    ("| Please submit a bug report; see" &
-                     " http://gcc.gnu.org/bugs.html.");
-                  End_Line;
                end if;
 
-               if GNATPRO_Version then
+               if not (Is_Public_Version or Is_FSF_Version) then
                   Write_Str
                     ("| (include your customer number #nnn " &
                      "in the subject line).");
@@ -307,7 +305,7 @@ package body Comperr is
                  ("| (concatenated together with no headers between files).");
                End_Line;
 
-               if Public_Version then
+               if Is_Public_Version then
                   Write_Str
                     ("| (use plain ASCII or MIME attachment).");
                   End_Line;
@@ -317,7 +315,17 @@ package body Comperr is
                      "for submitting bugs.");
                   End_Line;
 
-               elsif GNATPRO_Version then
+               elsif Is_GAP_Version then
+                  Write_Str
+                    ("| (use plain ASCII or MIME attachment, or FTP "
+                     & "to your GAP account.).");
+                  End_Line;
+
+                  Write_Str
+                    ("| Please use your GAP account to report this.");
+                  End_Line;
+
+               elsif not Is_FSF_Version then
                   Write_Str
                     ("| (use plain ASCII or MIME attachment, or FTP "
                      & "to your customer directory).");