Commit e15bb83e authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r326235: 

------------------------------------------------------------------------
r326235 | mstorsjo | 2018-02-27 11:42:19 -0800 (Tue, 27 Feb 2018) | 6 lines

[MinGW, CrossWindows] Allow passing -static together with -shared

In these combinations, link a DLL as usual, but pass -Bstatic instead
of -Bdynamic to indicate prefering static libraries.

Differential Revision: https://reviews.llvm.org/D43811
------------------------------------------------------------------------

llvm-svn: 333566
parent 3bc2d0a6

clang/lib/Driver/ToolChains/CrossWindows.cpp

+2 −1
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ void tools::CrossWindows::Linker::ConstructJob( 
    }



    CmdArgs.push_back("-shared");

    CmdArgs.push_back("-Bdynamic");

    CmdArgs.push_back(Args.hasArg(options::OPT_static) ? "-Bstatic"

                                                       : "-Bdynamic");



    CmdArgs.push_back("--enable-auto-image-base");

clang/lib/Driver/ToolChains/MinGW.cpp

+12 −13
Original line number Diff line number Diff line
@@ -141,13 +141,13 @@ void tools::MinGW::Linker::ConstructJob(Compilation &C, const JobAction &JA, 
    CmdArgs.push_back("console");

  }



  if (Args.hasArg(options::OPT_static))

    CmdArgs.push_back("-Bstatic");

  else {

  if (Args.hasArg(options::OPT_mdll))

    CmdArgs.push_back("--dll");

  else if (Args.hasArg(options::OPT_shared))

    CmdArgs.push_back("--shared");

  if (Args.hasArg(options::OPT_static))

    CmdArgs.push_back("-Bstatic");

  else

    CmdArgs.push_back("-Bdynamic");

  if (Args.hasArg(options::OPT_mdll) || Args.hasArg(options::OPT_shared)) {

    CmdArgs.push_back("-e");
@@ -157,7 +157,6 @@ void tools::MinGW::Linker::ConstructJob(Compilation &C, const JobAction &JA, 
      CmdArgs.push_back("DllMainCRTStartup");

    CmdArgs.push_back("--enable-auto-image-base");

  }

  }



  CmdArgs.push_back("-o");

  CmdArgs.push_back(Output.getFilename());

clang/test/Driver/mingw-libgcc.c

+8 −5
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 
// Verified with gcc version 5.1.0 (i686-posix-dwarf-rev0, Built by MinGW-W64 project).



// gcc, static

// RUN: %clang -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s

// RUN: %clang -static -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s

// RUN: %clang -static-libgcc -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s

// RUN: %clang -static -shared -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s

// RUN: %clang -static-libgcc -shared -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s

// RUN: %clang -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefixes=CHECK_STATIC,CHECK_BDYNAMIC %s

// RUN: %clang -static -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefixes=CHECK_STATIC,CHECK_BSTATIC %s

// RUN: %clang -static-libgcc -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefixes=CHECK_STATIC,CHECK_BDYNAMIC %s

// RUN: %clang -static -shared -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefixes=CHECK_STATIC,CHECK_SHARED,CHECK_BSTATIC %s

// RUN: %clang -static-libgcc -shared -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefixes=CHECK_STATIC,CHECK_SHARED,CHECK_BDYNAMIC %s



// gcc, dynamic

// RUN: %clang -shared -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_DYNAMIC %s
@@ -21,5 +21,8 @@ 
// RUN: %clang --driver-mode=g++ -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_DYNAMIC %s

// RUN: %clang -shared --driver-mode=g++ -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_DYNAMIC %s



// CHECK_SHARED: "--shared"

// CHECK_BSTATIC: "-Bstatic"

// CHECK_BDYNAMIC: "-Bdynamic"

// CHECK_STATIC: "-lgcc" "-lgcc_eh"

// CHECK_DYNAMIC: "-lgcc_s" "-lgcc"

clang/test/Driver/windows-cross.c

+10 −0
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ 


// CHECK-BASIC-LIBCXX: armv7-windows-itanium-ld" "--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry" "mainCRTStartup" "--allow-multiple-definition" "-o" "{{[^"]*}}" "{{[^"]*}}.o" "-lmsvcrt"



// RUN: %clang -### -target armv7-windows-itanium --sysroot %S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin -fuse-ld=ld -stdlib=libstdc++ -rtlib=compiler-rt -static -o /dev/null %s 2>&1 \

// RUN:   | FileCheck %s --check-prefix CHECK-STATIC



// CHECK-STATIC: armv7-windows-itanium-ld" "--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-Bstatic" "--entry" "mainCRTStartup" "--allow-multiple-definition" "-o" "{{[^"]*}}" "{{[^"]*}}.o" "-lmsvcrt"



// RUN: %clang -### -target armv7-windows-itanium --sysroot %s/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin -fuse-ld=ld -rtlib=compiler-rt -stdlib=libstdc++ -o /dev/null %s 2>&1 \

// RUN:   | FileCheck %s --check-prefix CHECK-RTLIB
@@ -23,6 +28,11 @@ 


// CHECK-SHARED: armv7-windows-itanium-ld" "--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-shared" "-Bdynamic" "--enable-auto-image-base" "--entry" "_DllMainCRTStartup" "--allow-multiple-definition" "-o" "shared.dll" "--out-implib" "shared.lib" "{{.*}}.o" "-lmsvcrt" "{{.*[\\/]}}clang_rt.builtins-arm.lib"



// RUN: %clang -### -target armv7-windows-itanium --sysroot %S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin -fuse-ld=ld -shared -rtlib=compiler-rt -stdlib=libc++ -static -o shared.dll %s 2>&1 \

// RUN:   | FileCheck %s --check-prefix CHECK-SHARED-STATIC



// CHECK-SHARED-STATIC: armv7-windows-itanium-ld" "--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-shared" "-Bstatic" "--enable-auto-image-base" "--entry" "_DllMainCRTStartup" "--allow-multiple-definition" "-o" "shared.dll" "--out-implib" "shared.lib" "{{.*}}.o" "-lmsvcrt" "{{.*[\\/]}}clang_rt.builtins-arm.lib"



// RUN: %clang -### -target armv7-windows-itanium --sysroot %s/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin -fuse-ld=ld -shared -rtlib=compiler-rt -stdlib=libc++ -nostartfiles -o shared.dll %s 2>&1 \

// RUN:   | FileCheck %s --check-prefix CHECK-NOSTARTFILES