[Bug ada/14665] New: gnatmake invokes wrong cross tools

[Bug ada/14665] New: gnatmake invokes wrong cross tools

[joel at gcc dot gnu dot org]

When using a target name with versioning such as sparc-rtems4.7, the 
current code in osint.adb:Find_Program_Name strips off the trailing 
digits.  Discussions on the gcc mailing list start at this thread:

http://gcc.gnu.org/ml/gcc/2004-03/msg00968.html

In general, across various hosts, the "basename" portion of the full path
is something like this format after being converted to lower case:

XXX[.exe][[;.][0-9]+

where XXX is the name of the tool.  Under VMS, you get .exe followed
by a ";" or "." and a version between 1 and 32767.

-- 
           Summary: gnatmake invokes wrong cross tools
           Product: gcc
           Version: 3.4.0
            Status: UNCONFIRMED
          Severity: normal
          Priority: P2
         Component: ada
        AssignedTo: unassigned at gcc dot gnu dot org
        ReportedBy: joel at gcc dot gnu dot org
                CC: charlet at act-europe dot fr,gcc-bugs at gcc dot gnu dot
                    org
 GCC build triplet: i686-pc-linux-gnu
  GCC host triplet: i686-pc-linux-gnu
GCC target triplet: *-rtems4.7 or any other versioned target


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14665

[Bug ada/14665] gnatmake invokes wrong cross tools

[pinskia at gcc dot gnu dot org]

------- Additional Comments From pinskia at gcc dot gnu dot org  2004-03-20 19:22 -------
Confirmed.

-- 
           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |NEW
     Ever Confirmed|                            |1
   Last reconfirmed|0000-00-00 00:00:00         |2004-03-20 19:22:26
               date|                            |


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14665

[Bug ada/14665] gnatmake invokes wrong cross tools

[charlet at gcc dot gnu dot org]

------- Additional Comments From charlet at gcc dot gnu dot org  2004-04-01 09:05 -------
Patch looks generally fine.

A few style issues:

- use 'exit when condition' rather than 'if condition then exit; end if'
- use 'and then' instead of 'and' in conditions
- indent multiple line if condition as follows:
  if condition
    and then condition2
  then

  rather than:

  if condition and
    condition2 then

Arno

-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14665

[Bug ada/14665] gnatmake invokes wrong cross tools

[charlet at act-europe dot fr]

------- Additional Comments From charlet at act-europe dot fr  2004-04-01 15:09 -------
Subject: Re:  gnatmake invokes wrong cross tools

> Is this more what you had in mind?  If so, please commit this.

Closer.

There's still a style issue with

         if To_Lower (Command_Name (Cindex2)) = 'e'
            and then To_Lower (Command_Name (Cindex2 - 1)) = 'x'
            and then To_Lower (Command_Name (Cindex2 - 2)) = 'e'
            and then To_Lower (Command_Name (Cindex2 - 3)) = '.' then
            Cindex2 := Cindex2 - 4;
         end if;

Should be:

         if To_Lower (Command_Name (Cindex2)) = 'e'
           and then To_Lower (Command_Name (Cindex2 - 1)) = 'x'
           and then To_Lower (Command_Name (Cindex2 - 2)) = 'e'
           and then To_Lower (Command_Name (Cindex2 - 3)) = '.'
         then
            Cindex2 := Cindex2 - 4;
         end if;

Although doing the comparison backwards is misleading, so I'd compare
it forward instead as well:

         if Cindex2 - Cindex1 >= 4
           and then To_Lower (Command_Name (Cindex2 - 3)) = '.'
           and then To_Lower (Command_Name (Cindex2 - 2)) = 'e'
           and then To_Lower (Command_Name (Cindex2 - 1)) = 'x'
           and then To_Lower (Command_Name (Cindex2)) = 'e'
         then
            Cindex2 := Cindex2 - 4;
         end if;

I can't commit your change, since you haven't submitted a changelog.
Also I don't have time to test this change, so please do the change above and
test your change.

Arno


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14665

[Bug ada/14665] gnatmake invokes wrong cross tools

[charlet at gcc dot gnu dot org]

------- Additional Comments From charlet at gcc dot gnu dot org  2004-04-02 16:01 -------
Patch is OK for commit, assuming a succesful build/make check-ada on a native
platform.

Arno

-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14665

[Bug ada/14665] gnatmake invokes wrong cross tools

[cvs-commit at gcc dot gnu dot org]

------- Additional Comments From cvs-commit at gcc dot gnu dot org  2004-04-08 17:26 -------
Subject: Bug 14665

CVSROOT:	/cvs/gcc
Module name:	gcc
Branch: 	gcc-3_4-branch
Changes by:	joel@gcc.gnu.org	2004-04-08 17:26:54

Modified files:
	gcc            : ChangeLog 
	gcc/ada        : osint.adb 

Log message:
	2004-04-08  Joel Sherrill  <joel@oarcorp.com>
	
	PR ada/14665
	* ada/osint.adb (Find_Program_Name): Rework to properly handle
	filenames which end in .exe or have versioning suffixes like VMS.

Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/ChangeLog.diff?cvsroot=gcc&only_with_tag=gcc-3_4-branch&r1=2.2326.2.385&r2=2.2326.2.386
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/ada/osint.adb.diff?cvsroot=gcc&only_with_tag=gcc-3_4-branch&r1=1.16&r2=1.16.4.1



-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14665

[Bug ada/14665] gnatmake invokes wrong cross tools

[cvs-commit at gcc dot gnu dot org]

------- Additional Comments From joel at gcc dot gnu dot org  2004-04-08 17:30 -------
Patch committed to 3.4 branch and Head.
------- Additional Comments From cvs-commit at gcc dot gnu dot org  2004-04-08 17:30 -------
Subject: Bug 14665

CVSROOT:	/cvs/gcc
Module name:	gcc
Changes by:	joel@gcc.gnu.org	2004-04-08 17:30:32

Modified files:
	gcc            : ChangeLog 
	gcc/ada        : osint.adb 

Log message:
	2004-04-08  Joel Sherrill  <joel@oarcorp.com>
	
	PR ada/14665
	* ada/osint.adb (Find_Program_Name): Rework to properly handle
	filenames which end in .exe or have versioning suffixes like VMS.

Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/ChangeLog.diff?cvsroot=gcc&r1=2.3363&r2=2.3364
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/ada/osint.adb.diff?cvsroot=gcc&r1=1.20&r2=1.21



-- 
           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14665

[Bug ada/14665] gnatmake invokes wrong cross tools

[joel at gcc dot gnu dot org]

------- Additional Comments From joel at gcc dot gnu dot org  2004-04-08 17:30 -------
Patch committed to 3.4 branch and Head.
------- Additional Comments From cvs-commit at gcc dot gnu dot org  2004-04-08 17:30 -------
Subject: Bug 14665

CVSROOT:	/cvs/gcc
Module name:	gcc
Changes by:	joel@gcc.gnu.org	2004-04-08 17:30:32

Modified files:
	gcc            : ChangeLog 
	gcc/ada        : osint.adb 

Log message:
	2004-04-08  Joel Sherrill  <joel@oarcorp.com>
	
	PR ada/14665
	* ada/osint.adb (Find_Program_Name): Rework to properly handle
	filenames which end in .exe or have versioning suffixes like VMS.

Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/ChangeLog.diff?cvsroot=gcc&r1=2.3363&r2=2.3364
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/ada/osint.adb.diff?cvsroot=gcc&r1=1.20&r2=1.21



-- 
           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14665

[Bug ada/14665] gnatmake invokes wrong cross tools

[pinskia at gcc dot gnu dot org]

-- 
           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|---                         |3.4.0


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14665