From owner-freebsd-emulation@freebsd.org Sun May 24 14:49:08 2020 Return-Path: Delivered-To: freebsd-emulation@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7875F32F7CC for ; Sun, 24 May 2020 14:49:08 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49VNQp724hz47py for ; Sun, 24 May 2020 14:49:06 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id 04OEmwna043806 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sun, 24 May 2020 17:49:01 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 04OEmwna043806 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id 04OEmwNW043805; Sun, 24 May 2020 17:48:58 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 24 May 2020 17:48:58 +0300 From: Konstantin Belousov To: Damjan Jovanovic Cc: Gerald Pfeifer , freebsd-emulation@freebsd.org Subject: Re: Wine 5.9 bugfix Message-ID: <20200524144858.GR64045@kib.kiev.ua> References: <20200523111633.GO64045@kib.kiev.ua> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home X-Rspamd-Queue-Id: 49VNQp724hz47py X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mx1.freebsd.org: 2001:470:d5e7:1::1 is neither permitted nor denied by domain of kostikbel@gmail.com) smtp.mailfrom=kostikbel@gmail.com X-Spamd-Result: default: False [0.37 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.06)[-0.064]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; FREEMAIL_FROM(0.00)[gmail.com]; NEURAL_SPAM_SHORT(0.22)[0.225]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_SPAM_LONG(0.21)[0.214]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none] X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 May 2020 14:49:08 -0000 On Sun, May 24, 2020 at 03:45:47PM +0200, Damjan Jovanovic wrote: > On Sun, May 24, 2020 at 3:40 PM Gerald Pfeifer wrote: > > > On Sat, 23 May 2020, Damjan Jovanovic wrote: > > > For Wine. I'll submit it upstream when the rtld-elf patch goes into > > > stable/12. > > > > What will happen to users on FreeBSD 11 (or 12 before the rtld-elf > > patch) when that additional patch goes into upstream Wine? > > > > Gerald > > > > This is the patch I would send, it effectively changes 2 lines to check an > extra condition (__FreeBSD_version < 1202000): > > > commit c81fc2e8dc75c5dcab300da4fa6cc6ccfb0c3d15 (freebsd-mmap) > Author: Damjan Jovanovic > Date: Sat May 23 13:49:31 2020 +0200 > > ntdll: only use the link_map.l_addr workaround on FreeBSD < 12.2 > > FreeBSD 12.2 will change the meaning of link_map.l_addr to be > the offset from file addresses to RAM addresses, like it is in > Linux/NetBSD/Illumos > (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246561) > > Signed-off-by: Damjan Jovanovic > > diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c > index 6e41b37ad8..bdd7794683 100644 > --- a/dlls/ntdll/loader.c > +++ b/dlls/ntdll/loader.c > @@ -1317,7 +1317,7 @@ static void call_tls_callbacks( HMODULE module, UINT > reason ) > } > } > > -#ifdef __FreeBSD__ > +#if defined(__FreeBSD__) && (__FreeBSD_version < 1202000) > /* The PT_LOAD segments are sorted in increasing order, and the first > * starts at the beginning of the ELF file. By parsing the file, we can > * find that first PT_LOAD segment, from which we can find the base > @@ -1370,7 +1370,7 @@ static void call_constructors( WINE_MODREF *wm ) > { > caddr_t relocbase = (caddr_t)map->l_addr; > > -#ifdef __FreeBSD__ /* FreeBSD doesn't relocate l_addr */ > +#if defined(__FreeBSD__) && (__FreeBSD_version < 1202000) /* FreeBSD > doesn't relocate l_addr */ > if (!get_relocbase(map->l_addr, &relocbase)) return; > #endif > switch (dyn->d_tag) Can you check for presence of link_map.l_base instead of looking for the version ? Configure scripts should easily handle this.