From e8bd500e2dcdfdd5f798e403662942d0dc3d6a86 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Mon, 12 Dec 2011 12:28:03 +0100 Subject: [multiple changes] 2011-12-12 Tristan Gingold * mlib-tgt-specific-xi.adb: (Get_Target_Prefix): Simplify code. 2011-12-12 Thomas Quinot * par_sco.adb: Adjust dominant marker for branches of CASE statements. 2011-12-12 Thomas Quinot * gsocket.h, s-oscons-tmplt.c: Ensure we do not include any system header file prior to redefining FD_SETSIZE. 2011-12-12 Ed Schonberg * sem_ch13.adb (Check_Aspect_At_End_Of_Declarations): In a generic context the aspect expressions may not have been preanalyzed if there was no previous freeze point, so the expressions must be preanalyzed now, and there is no conformance to check for visibility changes. 2011-12-12 Matthew Heaney * a-convec.adb, a-coinve.adb, a-cobove.adb (Iterator): Use subtype Index_Type'Base for Index component (Finalize): Remove unnecessary access check (First, Last): Cursor return value depends on iterator index value (Iterate): Use start position as iterator index value (Next, Previous): Forward to corresponding cursor-based operation. * a-cborma.adb (Iterate): Properly initialize iterator object (with 0 as node index). From-SVN: r182226 --- gcc/ada/mlib-tgt-specific-xi.adb | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) (limited to 'gcc/ada/mlib-tgt-specific-xi.adb') diff --git a/gcc/ada/mlib-tgt-specific-xi.adb b/gcc/ada/mlib-tgt-specific-xi.adb index 10c57b4..ac64be4 100644 --- a/gcc/ada/mlib-tgt-specific-xi.adb +++ b/gcc/ada/mlib-tgt-specific-xi.adb @@ -3,11 +3,10 @@ -- GNAT COMPILER COMPONENTS -- -- -- -- M L I B . T G T. S P E C I F I C -- --- (Bare Board Version) -- -- -- -- B o d y -- -- -- --- Copyright (C) 2003-2008, Free Software Foundation, Inc. -- +-- Copyright (C) 2003-2011, 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- -- @@ -139,33 +138,11 @@ package body MLib.Tgt.Specific is function Get_Target_Prefix return String is Target_Name : constant String_Ptr := Sdefault.Target_Name; - Index : Positive := Target_Name'First; begin - while Index < Target_Name'Last - and then Target_Name (Index + 1) /= '-' - loop - Index := Index + 1; - end loop; - - if Target_Name (Target_Name'First .. Index) = "avr" then - return "avr-"; - elsif Target_Name (Target_Name'First .. Index) = "erc32" then - return "erc32-elf-"; - elsif Target_Name (Target_Name'First .. Index) = "leon" then - return "leon-elf-"; - elsif Target_Name (Target_Name'First .. Index) = "powerpc" then - if Target_Name'Length >= 23 and then - Target_Name (Target_Name'First .. Target_Name'First + 22) = - "powerpc-unknown-eabispe" - then - return "powerpc-eabispe-"; - else - return "powerpc-elf-"; - end if; - else - return ""; - end if; + -- Target_name is the program prefix without '-' but with a trailing '/' + + return Target_Name (Target_Name'First .. Target_Name'Last - 1) & '-'; end Get_Target_Prefix; -------------------------------------- -- cgit v1.1