Merged to 8.0 in r351420.
On Wed, Jan 16, 2019 at 2:32 PM Anton Korobeynikov via cfe-commits <cfe-commits@lists.llvm.org> wrote: > > Author: asl > Date: Wed Jan 16 05:28:30 2019 > New Revision: 351340 > > URL: http://llvm.org/viewvc/llvm-project?rev=351340&view=rev > Log: > [MSP430] Fix msp430-toolchain.c on Windows (added in r351228) > > Patch by Kristina Bessonova! > > Differential Revision: https://reviews.llvm.org/D56776 > > > Modified: > cfe/trunk/test/Driver/msp430-toolchain.c > > Modified: cfe/trunk/test/Driver/msp430-toolchain.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/msp430-toolchain.c?rev=351340&r1=351339&r2=351340&view=diff > ============================================================================== > --- cfe/trunk/test/Driver/msp430-toolchain.c (original) > +++ cfe/trunk/test/Driver/msp430-toolchain.c Wed Jan 16 05:28:30 2019 > @@ -8,44 +8,44 @@ > // RUN: --gcc-toolchain=%S/Inputs/basic_msp430_tree 2>&1 \ > // RUN: | FileCheck -check-prefix=MSP430 %s > > -// MSP430: > "{{.*}}Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../../../bin/msp430-elf-ld" > +// MSP430: > "{{.*}}Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../..{{/|\\\\}}..{{/|\\\\}}bin{{/|\\\\}}msp430-elf-ld" > // MSP430: "-L{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/430" > -// MSP430: > "-L{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../../../msp430-elf/lib/430" > -// MSP430: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../../../msp430-elf/lib/430/crt0.o" > -// MSP430: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/430/crtbegin.o" > +// MSP430: > "-L{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../..{{/|\\\\}}..{{/|\\\\}}msp430-elf{{/|\\\\}}lib/430" > +// MSP430: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../..{{/|\\\\}}..{{/|\\\\}}msp430-elf{{/|\\\\}}lib/430{{/|\\\\}}crt0.o" > +// MSP430: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/430{{/|\\\\}}crtbegin.o" > // MSP430: "--start-group" "-lmul_none" "-lgcc" "-lc" "-lcrt" "-lnosys" > "--end-group" > -// MSP430: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/430/crtend.o" > -// MSP430: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../../../msp430-elf/lib/430/crtn.o" > +// MSP430: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/430{{/|\\\\}}crtend.o" > +// MSP430: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../..{{/|\\\\}}..{{/|\\\\}}msp430-elf{{/|\\\\}}lib/430{{/|\\\\}}crtn.o" > > // RUN: %clang %s -### -no-canonical-prefixes -target msp430 -nodefaultlibs \ > // RUN: --gcc-toolchain=%S/Inputs/basic_msp430_tree 2>&1 \ > // RUN: | FileCheck -check-prefix=MSP430-NO-DFT-LIB %s > > -// MSP430-NO-DFT-LIB: > "{{.*}}Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../../../bin/msp430-elf-ld" > +// MSP430-NO-DFT-LIB: > "{{.*}}Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../..{{/|\\\\}}..{{/|\\\\}}bin{{/|\\\\}}msp430-elf-ld" > // MSP430-NO-DFT-LIB: > "-L{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/430" > -// MSP430-NO-DFT-LIB: > "-L{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../../../msp430-elf/lib/430" > -// MSP430-NO-DFT-LIB: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../../../msp430-elf/lib/430/crt0.o" > -// MSP430-NO-DFT-LIB: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/430/crtbegin.o" > +// MSP430-NO-DFT-LIB: > "-L{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../..{{/|\\\\}}..{{/|\\\\}}msp430-elf{{/|\\\\}}lib/430" > +// MSP430-NO-DFT-LIB: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../..{{/|\\\\}}..{{/|\\\\}}msp430-elf{{/|\\\\}}lib/430{{/|\\\\}}crt0.o" > +// MSP430-NO-DFT-LIB: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/430{{/|\\\\}}crtbegin.o" > // MSP430-NO-DFT-LIB: "--start-group" "-lmul_none" "-lgcc" "--end-group" > -// MSP430-NO-DFT-LIB: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/430/crtend.o" > -// MSP430-NO-DFT-LIB: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../../../msp430-elf/lib/430/crtn.o" > +// MSP430-NO-DFT-LIB: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/430{{/|\\\\}}crtend.o" > +// MSP430-NO-DFT-LIB: > "{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../..{{/|\\\\}}..{{/|\\\\}}msp430-elf{{/|\\\\}}lib/430{{/|\\\\}}crtn.o" > > // RUN: %clang %s -### -no-canonical-prefixes -target msp430 -nostartfiles \ > // RUN: --gcc-toolchain=%S/Inputs/basic_msp430_tree 2>&1 \ > // RUN: | FileCheck -check-prefix=MSP430-NO-START %s > > -// MSP430-NO-START: > "{{.*}}Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../../../bin/msp430-elf-ld" > +// MSP430-NO-START: > "{{.*}}Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../..{{/|\\\\}}..{{/|\\\\}}bin{{/|\\\\}}msp430-elf-ld" > // MSP430-NO-START: > "-L{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/430" > -// MSP430-NO-START: > "-L{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../../../msp430-elf/lib/430" > +// MSP430-NO-START: > "-L{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../..{{/|\\\\}}..{{/|\\\\}}msp430-elf{{/|\\\\}}lib/430" > // MSP430-NO-START: "--start-group" "-lmul_none" "-lgcc" "-lc" "-lcrt" > "-lnosys" "--end-group" > > // RUN: %clang %s -### -no-canonical-prefixes -target msp430 -nostdlib \ > // RUN: --gcc-toolchain=%S/Inputs/basic_msp430_tree 2>&1 \ > // RUN: | FileCheck -check-prefix=MSP430-NO-STD-LIB %s > > -// MSP430-NO-STD-LIB: > "{{.*}}Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../../../bin/msp430-elf-ld" > +// MSP430-NO-STD-LIB: > "{{.*}}Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../..{{/|\\\\}}..{{/|\\\\}}bin{{/|\\\\}}msp430-elf-ld" > // MSP430-NO-STD-LIB: > "-L{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/430" > -// MSP430-NO-STD-LIB: > "-L{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../../../msp430-elf/lib/430" > +// MSP430-NO-STD-LIB: > "-L{{.*}}/Inputs/basic_msp430_tree/lib/gcc/msp430-elf/7.3.1/../../..{{/|\\\\}}..{{/|\\\\}}msp430-elf{{/|\\\\}}lib/430" > // MSP430-NO-STD-LIB: "--start-group" "-lmul_none" "-lgcc" "--end-group" > > // RUN: %clang %s -### -no-canonical-prefixes -target msp430 > -mmcu=msp430f147 2>&1 \ > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
