[4.2 PATCH] Backport fix for Darwin build failure in libjava

[4.2 PATCH] Backport fix for Darwin build failure in libjava

[Roger Sayle]

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


I apologise that the timing is unfortunate coming immediately after the 
release of 4.2.2,
but I've only just discovered that bootstrap of the gcc-4_2-branch is 
currently broken on
powerpc-apple-darwin7.9.0.  Fortunately, my patch from June to fix the 
identical problem
on mainline applies cleanly to the release branch and fixes the failure.
http://gcc.gnu.org/ml/java-patches/2007-q2/msg00303.html

The following patch is a backport from mainline of the above fix.  Tested on
powerpc-apple-darwin7.9.0.  Ok for the 4.2 branch after it unfreezes?

2007-10-09  Roger Sayle  <roger@eyesopen.com>

        Backport from mainline.
        * java/lang/natPosixProcess.cc: Include <sys/time.h> before
        <sys/resource.h> to restore bootstrap on powerpc-apple-darwin7.9.0.

Roger
--

[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 472 bytes --]

Index: java/lang/natPosixProcess.cc
===================================================================
*** java/lang/natPosixProcess.cc	(revision 129072)
--- java/lang/natPosixProcess.cc	(working copy)
*************** details.  */
*** 17,22 ****
--- 17,25 ----
  #include <fcntl.h>
  #include <sys/types.h>
  #include <sys/wait.h>
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+ #endif
  #ifdef HAVE_SYS_RESOURCE_H
  #include <sys/resource.h>
  #endif

Re: [4.2 PATCH] Backport fix for Darwin build failure in libjava

[Mark Mitchell]

Roger Sayle wrote:

> The following patch is a backport from mainline of the above fix. 
> Tested on
> powerpc-apple-darwin7.9.0.  Ok for the 4.2 branch after it unfreezes?

It's unfrozen, and this is OK.

Thanks,

-- 
Mark Mitchell
CodeSourcery
mark@codesourcery.com
(650) 331-3385 x713