=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: loader: Don' t warn for limited user address space on ARM64.

Alexandre Julliard julliard at winehq.org
Wed Oct 25 13:58:43 CDT 2017


Module: wine
Branch: master
Commit: 0ad8bb4ecf2f538cef14f2427670148668f0ee0f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0ad8bb4ecf2f538cef14f2427670148668f0ee0f

Author: André Hentschel <nerv at dawncrow.de>
Date:   Fri Oct 20 21:14:52 2017 +0200

loader: Don't warn for limited user address space on ARM64.

Signed-off-by: André Hentschel <nerv at dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 loader/preloader.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/loader/preloader.c b/loader/preloader.c
index 5068a60..6cb8e15 100644
--- a/loader/preloader.c
+++ b/loader/preloader.c
@@ -1326,7 +1326,11 @@ void* wld_start( void **stack )
                            MAP_FIXED | MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, -1, 0 ) == (void *)-1)
         {
             /* don't warn for low 64k */
-            if (preload_info[i].addr >= (void *)0x10000)
+            if (preload_info[i].addr >= (void *)0x10000
+#ifdef __aarch64__
+                && preload_info[i].addr < (void *)0x7fffffffff /* ARM64 address space might end here*/
+#endif
+            )
                 wld_printf( "preloader: Warning: failed to reserve range %p-%p\n",
                             preload_info[i].addr, (char *)preload_info[i].addr + preload_info[i].size );
             remove_preload_range( i );




More information about the wine-cvs mailing list