Author: compnerd
Date: Mon Oct 27 22:15:02 2014
New Revision: 220760
URL: http://llvm.org/viewvc/llvm-project?rev=220760&view=rev
Log:
Driver: remove a stray s that propagated in cross-windows
The option is '--allow-multiple-definition' not '--allow-multiple-definitions'.
Modified:
cfe/trunk/lib/Driver/Tools.cpp
cfe/trunk/test/Driver/windows-cross.c
Modified: cfe/trunk/lib/Driver/Tools.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=220760&r1=220759&r2=220760&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Mon Oct 27 22:15:02 2014
@@ -8254,7 +8254,7 @@ void CrossWindows::Link::ConstructJob(Co
}
// NOTE: deal with multiple definitions on Windows (e.g. COMDAT)
- CmdArgs.push_back("--allow-multiple-definitions");
+ CmdArgs.push_back("--allow-multiple-definition");
CmdArgs.push_back("-o");
CmdArgs.push_back(Output.getFilename());
Modified: cfe/trunk/test/Driver/windows-cross.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/windows-cross.c?rev=220760&r1=220759&r2=220760&view=diff
==============================================================================
--- cfe/trunk/test/Driver/windows-cross.c (original)
+++ cfe/trunk/test/Driver/windows-cross.c Mon Oct 27 22:15:02 2014
@@ -1,35 +1,35 @@
// RUN: %clang -### -target armv7-windows-itanium --sysroot
%S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin -o /dev/null %s
2>&1 \
// RUN: | FileCheck %s --check-prefix CHECK-BASIC
-// CHECK-BASIC: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry"
"mainCRTStartup" "--allow-multiple-definitions" "-o" "{{[^"]*}}"
"{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbegin.obj"
"-L{{.*}}/Inputs/Windows/ARM/8.1/usr/lib"
"-L{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/gcc" "{{.*}}.o" "-lmsvcrt" "-lgcc"
"--as-needed" "-lgcc_s" "--no-as-needed"
+// CHECK-BASIC: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry"
"mainCRTStartup" "--allow-multiple-definition" "-o" "{{[^"]*}}"
"{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbegin.obj"
"-L{{.*}}/Inputs/Windows/ARM/8.1/usr/lib"
"-L{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/gcc" "{{.*}}.o" "-lmsvcrt" "-lgcc"
"--as-needed" "-lgcc_s" "--no-as-needed"
// RUN: %clang -### -target armv7-windows-itanium --sysroot
%s/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin
-rtlib=compiler-rt -o /dev/null %s 2>&1 \
// RUN: | FileCheck %s --check-prefix CHECK-RTLIB
-// CHECK-RTLIB: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry"
"mainCRTStartup" "--allow-multiple-definitions" "-o" "{{[^"]*}}"
"{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbegin.obj"
"-L{{.*}}/Inputs/Windows/ARM/8.1/usr/lib"
"-L{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/gcc" "{{.*}}.o" "-lmsvcrt"
"{{.*[\\/]}}libclang_rt.builtins-arm.lib"
+// CHECK-RTLIB: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry"
"mainCRTStartup" "--allow-multiple-definition" "-o" "{{[^"]*}}"
"{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbegin.obj"
"-L{{.*}}/Inputs/Windows/ARM/8.1/usr/lib"
"-L{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/gcc" "{{.*}}.o" "-lmsvcrt"
"{{.*[\\/]}}libclang_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
-rtlib=compiler-rt -stdlib=libc++ -o /dev/null %s 2>&1 \
// RUN: | FileCheck %s --check-prefix CHECK-C-LIBCXX
-// CHECK-C-LIBCXX: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry"
"mainCRTStartup" "--allow-multiple-definitions" "-o" "{{[^"]*}}"
"{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbegin.obj" "{{.*}}.o" "-lmsvcrt"
"{{.*[\\/]}}libclang_rt.builtins-arm.lib"
+// CHECK-C-LIBCXX: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry"
"mainCRTStartup" "--allow-multiple-definition" "-o" "{{[^"]*}}"
"{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbegin.obj" "{{.*}}.o" "-lmsvcrt"
"{{.*[\\/]}}libclang_rt.builtins-arm.lib"
// RUN: %clangxx -### -target armv7-windows-itanium --sysroot
%S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin
-rtlib=compiler-rt -stdlib=libc++ -o /dev/null %s 2>&1 \
// RUN: | FileCheck %s --check-prefix CHECK-LIBCXX
-// CHECK-LIBCXX: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry"
"mainCRTStartup" "--allow-multiple-definitions" "-o" "{{[^"]*}}"
"{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbegin.obj" "{{.*}}.o" "-lc++"
"-lmsvcrt" "{{.*[\\/]}}libclang_rt.builtins-arm.lib"
+// CHECK-LIBCXX: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry"
"mainCRTStartup" "--allow-multiple-definition" "-o" "{{[^"]*}}"
"{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbegin.obj" "{{.*}}.o" "-lc++"
"-lmsvcrt" "{{.*[\\/]}}libclang_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 -shared
-rtlib=compiler-rt -stdlib=libc++ -o shared.dll %s 2>&1 \
// RUN: | FileCheck %s --check-prefix CHECK-SHARED
-// CHECK-SHARED: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-shared" "-Bdynamic"
"--enable-auto-image-base" "--entry" "_DllMainCRTStartup"
"--allow-multiple-definitions" "-o" "shared.dll" "--out-implib" "shared.lib"
"{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbeginS.obj" "{{.*}}.o" "-lmsvcrt"
"{{.*[\\/]}}libclang_rt.builtins-arm.lib"
+// 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"
"{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbeginS.obj" "{{.*}}.o" "-lmsvcrt"
"{{.*[\\/]}}libclang_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 -shared
-rtlib=compiler-rt -stdlib=libc++ -nostartfiles -o shared.dll %s 2>&1 \
// RUN: | FileCheck %s --check-prefix CHECK-NOSTARTFILES
-// CHECK-NOSTARTFILES: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-shared" "-Bdynamic"
"--enable-auto-image-base" "--entry" "_DllMainCRTStartup"
"--allow-multiple-definitions" "-o" "shared.dll" "--out-implib" "shared.lib"
"{{.*}}.o" "-lmsvcrt" "{{.*[\\/]}}libclang_rt.builtins-arm.lib"
+// CHECK-NOSTARTFILES: 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" "{{.*[\\/]}}libclang_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 -shared
-rtlib=compiler-rt -stdlib=libc++ -nostartfiles -nodefaultlibs -o shared.dll %s
2>&1 \
// RUN: | FileCheck %s --check-prefix CHECK-STANDALONE
-// CHECK-STANDALONE: armv7-windows-itanium-ld"
"--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-shared" "-Bdynamic"
"--enable-auto-image-base" "--entry" "_DllMainCRTStartup"
"--allow-multiple-definitions" "-o" "shared.dll" "--out-implib" "shared.lib"
"{{.*}}.o"
+// CHECK-STANDALONE: 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"
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
