Alexandre Julliard : winegcc: Set page alignment to 4096 in all cases.

Alexandre Julliard julliard at winehq.org
Mon Apr 2 16:32:53 CDT 2018


Module: wine
Branch: master
Commit: 395a94d308d77786809eee9eb77b4e35c78fbf9e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=395a94d308d77786809eee9eb77b4e35c78fbf9e

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Apr  2 14:20:10 2018 +0200

winegcc: Set page alignment to 4096 in all cases.

This avoids leaving holes in builtin dll mappings.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 tools/winegcc/winegcc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 80dba4c..4be35d5 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -1136,13 +1136,13 @@ static void build(struct options* opts)
     default:
         if (opts->image_base)
         {
-            if (!try_link(opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000"))
-                strarray_add(link_args, "-Wl,-z,max-page-size=0x1000");
             if (!try_link(opts->prefix, link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base)))
                 strarray_add(link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base));
             else
                 prelink = PRELINK;
         }
+        if (!try_link(opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000"))
+            strarray_add(link_args, "-Wl,-z,max-page-size=0x1000");
         break;
     }
 




More information about the wine-cvs mailing list