[oatch]: Fix bootstrap of libgfortran for mingw targets

[oatch]: Fix bootstrap of libgfortran for mingw targets

[Kai Tietz]

[-- Attachment #1: Type: text/plain, Size: 506 bytes --]

Hello,

The recent patche
(http://gcc.gnu.org/viewcvs/trunk/libgfortran/io/unix.c?diff_format=h&view=log)
reasoned a compile failure for mingw targets in libgfortran.

ChangeLog

2009-11-30  Kai Tietz  <Kai.Tietz@onevision.com>

	* io/unix.c (find_file): Add variable id conditionally for mingw targets.

Tested for x86_64-pc-mingw32 and i686-pc-mingw32. Ok for apply?

Cheers,
Kai

-- 
|  (\_/) This is Bunny. Copy and paste
| (='.'=) Bunny into your signature to help
| (")_(") him gain world domination

[-- Attachment #2: fixfortran.diff --]
[-- Type: application/octet-stream, Size: 663 bytes --]

Index: gcc/libgfortran/io/unix.c
===================================================================
--- gcc.orig/libgfortran/io/unix.c	2009-11-29 21:36:40.000000000 +0100
+++ gcc/libgfortran/io/unix.c	2009-11-30 10:52:57.975879000 +0100
@@ -1287,6 +1287,9 @@
   char path[PATH_MAX + 1];
   struct stat st[2];
   gfc_unit *u;
+#if defined(__MINGW32__) && !HAVE_WORKING_STAT
+  uint64_t id = 0ULL;
+#endif
 
   if (unpack_filename (path, file, file_len))
     return NULL;
@@ -1295,7 +1298,7 @@
     return NULL;
 
 #if defined(__MINGW32__) && !HAVE_WORKING_STAT
-  id_from_path (path);
+  id = id_from_path (path);
 #endif
 
   __gthread_mutex_lock (&unit_lock);

Re: [oatch]: Fix bootstrap of libgfortran for mingw targets

[Jakub Jelinek]

On Mon, Nov 30, 2009 at 11:00:16AM +0100, Kai Tietz wrote:
> Hello,
> 
> The recent patche
> (http://gcc.gnu.org/viewcvs/trunk/libgfortran/io/unix.c?diff_format=h&view=log)
> reasoned a compile failure for mingw targets in libgfortran.
> 
> ChangeLog
> 
> 2009-11-30  Kai Tietz  <Kai.Tietz@onevision.com>
> 
> 	* io/unix.c (find_file): Add variable id conditionally for mingw targets.
> 
> Tested for x86_64-pc-mingw32 and i686-pc-mingw32. Ok for apply?

Ah, sorry, it wasn't obvious that id is actually used on mingw inside of
u = find_file0 (unit_root, FIND_FILE0_ARGS);

	Jakub

Re: [oatch]: Fix bootstrap of libgfortran for mingw targets

[Tobias Burnus]

On 11/30/2009 11:00 AM, Kai Tietz wrote:
> Hello,
> 
> The recent patche
> (http://gcc.gnu.org/viewcvs/trunk/libgfortran/io/unix.c?diff_format=h&view=log)
> reasoned a compile failure for mingw targets in libgfortran.
> 
> ChangeLog
> 2009-11-30  Kai Tietz  <Kai.Tietz@onevision.com>
> 	* io/unix.c (find_file): Add variable id conditionally for mingw targets.> 
> Tested for x86_64-pc-mingw32 and i686-pc-mingw32. Ok for apply?

OK.

Tobias

Re: [oatch]: Fix bootstrap of libgfortran for mingw targets

[Kai Tietz]

2009/11/30 Tobias Burnus <burnus@net-b.de>:
> On 11/30/2009 11:00 AM, Kai Tietz wrote:
>> Hello,
>>
>> The recent patche
>> (http://gcc.gnu.org/viewcvs/trunk/libgfortran/io/unix.c?diff_format=h&view=log)
>> reasoned a compile failure for mingw targets in libgfortran.
>>
>> ChangeLog
>> 2009-11-30  Kai Tietz  <Kai.Tietz@onevision.com>
>>       * io/unix.c (find_file): Add variable id conditionally for mingw targets.>
>> Tested for x86_64-pc-mingw32 and i686-pc-mingw32. Ok for apply?
>
> OK.
>
> Tobias
>

Applied,

Thanks,
Kai

-- 
|  (\_/) This is Bunny. Copy and paste
| (='.'=) Bunny into your signature to help
| (")_(") him gain world domination

Re: [oatch]: Fix bootstrap of libgfortran for mingw targets

[Steve Kargl]

On Mon, Nov 30, 2009 at 03:19:40PM +0100, Kai Tietz wrote:
> 2009/11/30 Tobias Burnus <burnus@net-b.de>:
> > On 11/30/2009 11:00 AM, Kai Tietz wrote:
> >> Hello,
> >>
> >> The recent patche
> >> (http://gcc.gnu.org/viewcvs/trunk/libgfortran/io/unix.c?diff_format=h&view=log)
> >> reasoned a compile failure for mingw targets in libgfortran.
> >>
> >> ChangeLog
> >> 2009-11-30 ?Kai Tietz ?<Kai.Tietz@onevision.com>
> >> ? ? ? * io/unix.c (find_file): Add variable id conditionally for mingw targets.>
> >> Tested for x86_64-pc-mingw32 and i686-pc-mingw32. Ok for apply?
> >
> > OK.
> >
> > Tobias
> >
> 
> Applied,

Is there some serious namespace pollution that you
need to fix on mingw?  id is set and never used in
this file.  Please add a very big comment on
the broken state of mingw or back out your patch.

-- 
Steve

Re: [oatch]: Fix bootstrap of libgfortran for mingw targets

[Tobias Burnus]

Steve Kargl wrote:
> Is there some serious namespace pollution that you
> need to fix on mingw?  id is set and never used in
> this file.  Please add a very big comment on
> the broken state of mingw or back out your patch.
>   

No, MinGW nor GCC is broken; it is just that "id" is a bit hidden - but
not hidden enough to mandate a comment:


# define FIND_FILE0_ARGS id, file, file_len

find_file (const char *file, gfc_charlen_type file_len)
{
[...]
  uint64_t id = 0ULL;
[...]
  id = id_from_path (path);
[...]
  u = find_file0 (unit_root, FIND_FILE0_ARGS);
[...]
}

Tobias