From owner-freebsd-emulation@freebsd.org Sun May 24 15:30:50 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 0E9DF2C8A50 for ; Sun, 24 May 2020 15:30:50 +0000 (UTC) (envelope-from damjan.jov@gmail.com) Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49VPLw72Bzz4CTT for ; Sun, 24 May 2020 15:30:48 +0000 (UTC) (envelope-from damjan.jov@gmail.com) Received: by mail-il1-x12e.google.com with SMTP id b71so15327941ilg.8 for ; Sun, 24 May 2020 08:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=nqmWGvk6bOQ9bXhceCmeu2rXxHGeMRuW5xSr4e+gTzI=; b=HLM8AimUDSYMipvUasz+BEbWZ2Kg1NJI6EiPjCatSXfb6sVOUxruPfSFcVJi7EEjtZ flSzBbUkHhbuiBSmSqFpzMtY8UhUFwOTo9wlqOrMcQWJt4lNo3ejmLbIKIs7lSRHetCn pTlPiZSVahPajGHOo7ca+OhtbREJ+sChYx71AX+LzpBwRbvDuPjhYQcV9Q/h/tO4UdvP zQ4MC71RNscQg2piXT0zUNtV3GR4S7jpDCW2h58DGBVK2qgH7zxqVsYdA0YCFabTby7x 1fUL2QS0bQAqykS9IZyiktnRXF1D4gqVmup/xGrcD126BVFk7xbD/Dap5gdZoUKrZChl 2c+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=nqmWGvk6bOQ9bXhceCmeu2rXxHGeMRuW5xSr4e+gTzI=; b=ZFU17p1cEOTmh4OnY6L2pXmuHS4k4fZWIpzFp9Dj5vWPDGcXrCZK9Hd5PbGTuqrZLV 8cuPjQfI9HbgUh6dvJv1dhIHwXd88pfztLCeebTUJc4Bl05xyzzAnpmVCo7yI0WJ7q7J 7iXmBz6ojDKT+ZxqWfzKeWd+7RVVR7K72REjVwwLx3LkKUMqWEF6vuhbtM3wzQUli+Av 8q5yOcnf2WmTuhDQsN+aseGzQ8wie/q0dI0o+C0ym6Qp7J55NBJAG8diTx8LlF4OHQJv so0yGOM+I3blTvIfg96OtWX/1BTFkLXr2R3GVE/8ewJUp3DRLbNJUBiJdC5ZwYuk6KAi mluw== X-Gm-Message-State: AOAM533OACHnMB246sBmqDdaGfagT4iw8RDQ4s0ycc9fVDAbsoo/1zbw kgdjOEVNY0Xw8z9C4yOEZhl6iqc+wKUjR/Du1KMKvzhgmvifFQ== X-Google-Smtp-Source: ABdhPJwMiEdi7aEP3zgP66DIdQjOP1//w6CWEhWJLbx389JFscU542R/TOWL3Z2KcTrL6WEi0QvBDZI6k2DzmeoFS9o= X-Received: by 2002:a92:9f4b:: with SMTP id u72mr21625434ili.273.1590334247891; Sun, 24 May 2020 08:30:47 -0700 (PDT) MIME-Version: 1.0 References: <20200523111633.GO64045@kib.kiev.ua> <20200524144858.GR64045@kib.kiev.ua> In-Reply-To: <20200524144858.GR64045@kib.kiev.ua> From: Damjan Jovanovic Date: Sun, 24 May 2020 17:29:55 +0200 Message-ID: Subject: Re: Wine 5.9 bugfix To: Konstantin Belousov Cc: Gerald Pfeifer , freebsd-emulation@freebsd.org X-Rspamd-Queue-Id: 49VPLw72Bzz4CTT X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=HLM8AimU; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of damjanjov@gmail.com designates 2607:f8b0:4864:20::12e as permitted sender) smtp.mailfrom=damjanjov@gmail.com X-Spamd-Result: default: False [-4.21 / 15.00]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; NEURAL_HAM_MEDIUM(-1.06)[-1.060]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-emulation@freebsd.org]; NEURAL_HAM_LONG(-1.01)[-1.007]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::12e:from]; NEURAL_HAM_SHORT(-1.14)[-1.142]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; TAGGED_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 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 15:30:50 -0000 On Sun, May 24, 2020 at 4:49 PM Konstantin Belousov wrote: > 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. > There is no link_map.l_base in your commit: https://svnweb.freebsd.org/base/head/sys/sys/link_elf.h?r1=326256&r2=361303&pathrev=361303