[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    [PATCH 2/2] winegcc: Try using msvc file align syntax if mingw-style is not supported.
From:       Jacek Caban <jacek () codeweavers ! com>
Date:       2020-07-31 14:22:43
Message-ID: 9221ba0e-bf91-56ba-49b5-8d4c6ada7df8 () codeweavers ! com
[Download RAW message or body]

Allows setting file alignment on LLD 10.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
---

Martin already added support for mingw-style option to upstream LLD, so 
that it will not be needed with future versions. Supporting older 
versions is easy enough that I decided to send this patch, but I don't 
mind if it's dropped.

  tools/winegcc/winegcc.c | 5 +++++
  1 file changed, 5 insertions(+)



["0002-winegcc-Try-using-msvc-file-align-syntax-if-mingw-styl.txt" (text/x-patch)]

diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 52ab034b3aa..bbb44ff6144 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -525,6 +525,11 @@ static strarray *get_link_args( struct options *opts, const char *output_name )
         if (!try_link( opts->prefix, link_args, "-Wl,--file-alignment,0x1000" ))
             strarray_add( link_args, strmake( "-Wl,--file-alignment,%s",
                                               opts->file_align ? opts->file_align : "0x1000" ));
+        else if (!try_link( opts->prefix, link_args, "-Wl,-Xlink=-filealign:0x1000" ))
+            /* lld from llvm 10 does not support mingw style --file-alignment,
+             * but it's possible to use msvc syntax */
+            strarray_add( link_args, strmake( "-Wl,-Xlink=-filealign:%s",
+                                              opts->file_align ? opts->file_align : "0x1000" ));
 
         strarray_addall( link_args, flags );
         return link_args;



[prev in list] [next in list] [prev in thread] [next in thread]