[1/2] loader: FreeBSD requires pre_exec() on x86_64

[David Naylor]

On Monday, 2 February 2015 22:22:24 André Hentschel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Am 02.02.2015 um 21:20 schrieb David Naylor:
> > Just as with i386, FreeBSD requires the maximum size of the data segment
> > to be extended on x86_64 for Wine to work correctly.
> > ---
> > 
> >  loader/main.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/loader/main.c b/loader/main.c
> > index ac67290..bb4f949 100644
> > --- a/loader/main.c
> > +++ b/loader/main.c
> > @@ -181,7 +181,7 @@ static int pre_exec(void)
> > 
> >      return 1;  /* we have a preloader on x86-64 */
> >  
> >  }
> > 
> > -#elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__) ||
> > defined(__DragonFly__)) && defined(__i386__) +#elif (defined(__FreeBSD__)
> > || defined (__FreeBSD_kernel__) || defined(__DragonFly__)) &&
> > (defined(__i386__) || defined(__x86_64__))> 
> >  static int pre_exec(void)
> >  {
> 
> This is already fixed for a while, see:
> 
> https://www.winehq.org/wwn/383#Wine64%20on%20FreeBSD
>  -> https://bugs.winehq.org/show_bug.cgi?id=34330
>      ->
> https://source.winehq.org/git/wine.git/blobdiff/036670810c7e8bf55a5ee0e71e3
> 2fa4a097dac02..4b708fc325753f1bb1c8210bb67757ebbf9f60dd:/loader/main.c

Excellent, sorry I missed this (I tried to do a git pull last night but it was 
getting stuck - and I was basing my work on Wine 1.7.33).  

Thank you for fixing this.  

I worked on part 2 of this patch with Tijl to get Wine running on FreeBSD.  
With that patch applied we were able to successfully test a 64-bit version of 
7Zip.  

Regards
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 949 bytes
Desc: This is a digitally signed message part.
URL: <http://www.winehq.org/pipermail/wine-devel/attachments/20150203/7a869d46/attachment.sig>