[PATCH] Pass CFLAGS when linking in pe-run2.exp

[Stephen Kitt <steve at sk2 dot org>]

Hi,

I'm not too sure about this one... I noticed that pe-run2.exp was failing
with i686-w64-mingw-gcc on my system, and it turns out that the build was
picking up -fstack-protector-strong. Both gcc and ld need that flag to link
the executable.

Signed-off-by: Stephen Kitt <steve@sk2.org>


diff --git a/ld/testsuite/ld-pe/pe-run2.exp b/ld/testsuite/ld-pe/pe-run2.exp
index 43f9f5d..e010dd0 100644
--- a/ld/testsuite/ld-pe/pe-run2.exp
+++ b/ld/testsuite/ld-pe/pe-run2.exp
@@ -84,7 +84,7 @@ proc test_direct2_link_dll {} {
        } else {
            # Check linking directly to direct2_dll.dll.
            set msg "linking client (.dll) fastcall/stdcall"
-           if [ld_simple_link "$CC -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_dll.exe \
+           if [ld_simple_link "$CC $CFLAGS -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_dll.exe \
              "$tmpdir/direct2_client.o $tmpdir/direct2_dll.dll" ] {
                pass $msg
            } else {
@@ -93,7 +93,7 @@ proc test_direct2_link_dll {} {
 
            # Check linking directly to direct2_dll.sl.
            set msg "linking client (.sl) fastcall/stdcall"
-           if [ld_simple_link "$CC -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_sl.exe \
+           if [ld_simple_link "$CC $CFLAGS -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_sl.exe \
              "$tmpdir/direct2_client.o $tmpdir/direct2_dll.sl" ] {
                pass $msg
            } else {
@@ -104,7 +104,7 @@ proc test_direct2_link_dll {} {
            # Create symbolic link.
            catch "exec ln -fs direct2_dll.dll $tmpdir/libdirect2_dll.dll.a" ln_catch
            set msg "linking client (symlink -> .dll) fastcall/stdcall"
-           if [ld_simple_link "$CC -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_symlink_dll.exe \
+           if [ld_simple_link "$CC $CFLAGS -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_symlink_dll.exe \
              "$tmpdir/direct2_client.o $tmpdir/libdirect2_dll.dll.a" ] {
                pass $msg
            } else {
@@ -115,7 +115,7 @@ proc test_direct2_link_dll {} {
            # Create symbolic link.
            catch "exec ln -fs direct2_dll.sl $tmpdir/libdirect2_sl.dll.a" ln_catch
            set msg "linking client (symlink -> .sl) fastcall/stdcall"
-           if [ld_simple_link "$CC -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_symlink_sl.exe \
+           if [ld_simple_link "$CC $CFLAGS -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_symlink_sl.exe \
              "$tmpdir/direct2_client.o $tmpdir/libdirect2_sl.dll.a" ] {
                pass $msg
            } else {

Attachment: pgpPAhGQ4KaM1.pgp
Description: OpenPGP digital signature