summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lld/lib/Driver/UniversalDriver.cpp18
-rw-r--r--lld/test/Driver/def-lib-search.test2
-rw-r--r--lld/test/Driver/flavor-option.test2
-rw-r--r--lld/test/Driver/lib-search.test10
-rw-r--r--lld/test/Driver/so-whole-archive.test4
-rw-r--r--lld/test/Driver/trivial-driver.test2
-rw-r--r--lld/test/Driver/undef-basic.objtxt2
-rw-r--r--lld/test/elf/AArch64/defsym.test2
-rw-r--r--lld/test/elf/AArch64/dontignorezerosize-sections.test2
-rw-r--r--lld/test/elf/AArch64/dynamicvars.test2
-rw-r--r--lld/test/elf/AArch64/dynlib-nointerp-section.test2
-rw-r--r--lld/test/elf/AArch64/general-dyn-tls-0.test2
-rw-r--r--lld/test/elf/AArch64/initfini.test2
-rw-r--r--lld/test/elf/AArch64/initial-exec-tls-0.test2
-rw-r--r--lld/test/elf/AArch64/local-tls.test2
-rw-r--r--lld/test/elf/AArch64/rel-abs16-overflow.test2
-rw-r--r--lld/test/elf/AArch64/rel-abs16.test2
-rw-r--r--lld/test/elf/AArch64/rel-abs32-overflow.test2
-rw-r--r--lld/test/elf/AArch64/rel-abs32.test2
-rw-r--r--lld/test/elf/AArch64/rel-abs64.test2
-rw-r--r--lld/test/elf/AArch64/rel-adr_prel_lo21-overflow.test2
-rw-r--r--lld/test/elf/AArch64/rel-adr_prel_lo21.test2
-rw-r--r--lld/test/elf/AArch64/rel-adr_prel_pg_hi21-overflow.test2
-rw-r--r--lld/test/elf/AArch64/rel-adr_prel_pg_hi21.test2
-rw-r--r--lld/test/elf/AArch64/rel-bad.test2
-rw-r--r--lld/test/elf/AArch64/rel-prel16-overflow.test2
-rw-r--r--lld/test/elf/AArch64/rel-prel16.test2
-rw-r--r--lld/test/elf/AArch64/rel-prel32-overflow.test2
-rw-r--r--lld/test/elf/AArch64/rel-prel32.test2
-rw-r--r--lld/test/elf/AArch64/rel-prel64.test2
-rw-r--r--lld/test/elf/AMDGPU/hsa.test2
-rw-r--r--lld/test/elf/ARM/arm-symbols.test2
-rw-r--r--lld/test/elf/ARM/defsym.test2
-rw-r--r--lld/test/elf/ARM/dynamic-symbols.test6
-rw-r--r--lld/test/elf/ARM/entry-point.test6
-rw-r--r--lld/test/elf/ARM/exidx.test2
-rw-r--r--lld/test/elf/ARM/header-flags.test6
-rw-r--r--lld/test/elf/ARM/mapping-code-model.test4
-rw-r--r--lld/test/elf/ARM/mapping-symbols.test2
-rw-r--r--lld/test/elf/ARM/missing-symbol.test2
-rw-r--r--lld/test/elf/ARM/plt-dynamic.test10
-rw-r--r--lld/test/elf/ARM/plt-ifunc-interwork.test18
-rw-r--r--lld/test/elf/ARM/plt-ifunc-mapping.test2
-rw-r--r--lld/test/elf/ARM/rel-abs32.test2
-rw-r--r--lld/test/elf/ARM/rel-arm-call.test4
-rw-r--r--lld/test/elf/ARM/rel-arm-jump24-veneer-b.test4
-rw-r--r--lld/test/elf/ARM/rel-arm-jump24-veneer-bl.test4
-rw-r--r--lld/test/elf/ARM/rel-arm-jump24.test4
-rw-r--r--lld/test/elf/ARM/rel-arm-mov.test2
-rw-r--r--lld/test/elf/ARM/rel-arm-prel31.test4
-rw-r--r--lld/test/elf/ARM/rel-arm-target1.test4
-rw-r--r--lld/test/elf/ARM/rel-arm-thm-interwork.test2
-rw-r--r--lld/test/elf/ARM/rel-base-prel.test2
-rw-r--r--lld/test/elf/ARM/rel-copy.test2
-rw-r--r--lld/test/elf/ARM/rel-glob-dat.test2
-rw-r--r--lld/test/elf/ARM/rel-got-brel.test2
-rw-r--r--lld/test/elf/ARM/rel-group-relocs.test2
-rw-r--r--lld/test/elf/ARM/rel-ifunc.test2
-rw-r--r--lld/test/elf/ARM/rel-jump-slot.test2
-rw-r--r--lld/test/elf/ARM/rel-rel32.test2
-rw-r--r--lld/test/elf/ARM/rel-thm-call.test4
-rw-r--r--lld/test/elf/ARM/rel-thm-jump11.test4
-rw-r--r--lld/test/elf/ARM/rel-thm-jump24-veneer.test4
-rw-r--r--lld/test/elf/ARM/rel-thm-jump24.test4
-rw-r--r--lld/test/elf/ARM/rel-thm-mov.test2
-rw-r--r--lld/test/elf/ARM/rel-tls-ie32.test4
-rw-r--r--lld/test/elf/ARM/rel-tls-le32.test4
-rw-r--r--lld/test/elf/ARM/rel-v4bx.test2
-rw-r--r--lld/test/elf/ARM/thm-symbols.test2
-rw-r--r--lld/test/elf/ARM/two-got-for-symbol.test2
-rw-r--r--lld/test/elf/ARM/undef-lazy-symbol.test6
-rw-r--r--lld/test/elf/ARM/veneer-mapping.test2
-rw-r--r--lld/test/elf/ARM/weak-branch.test6
-rw-r--r--lld/test/elf/Hexagon/dynlib-data.test2
-rw-r--r--lld/test/elf/Hexagon/dynlib-gotoff.test2
-rw-r--r--lld/test/elf/Hexagon/dynlib-hash.test2
-rw-r--r--lld/test/elf/Hexagon/dynlib-rela.test2
-rw-r--r--lld/test/elf/Hexagon/dynlib-syms.test2
-rw-r--r--lld/test/elf/Hexagon/dynlib.test2
-rw-r--r--lld/test/elf/Hexagon/hexagon-got-plt-order.test2
-rw-r--r--lld/test/elf/Hexagon/hexagon-plt-setup.test2
-rw-r--r--lld/test/elf/Hexagon/maxalignment.test2
-rw-r--r--lld/test/elf/Hexagon/rela-order.test2
-rw-r--r--lld/test/elf/Hexagon/sda-base.test2
-rw-r--r--lld/test/elf/Hexagon/zerofillquick-sdata.test2
-rw-r--r--lld/test/elf/Mips/abi-flags-01.test2
-rw-r--r--lld/test/elf/Mips/abi-flags-02.test2
-rw-r--r--lld/test/elf/Mips/abi-flags-03.test2
-rw-r--r--lld/test/elf/Mips/abi-flags-04.test8
-rw-r--r--lld/test/elf/Mips/abi-flags-05.test22
-rw-r--r--lld/test/elf/Mips/abi-flags-06.test2
-rw-r--r--lld/test/elf/Mips/abi-flags-07.test2
-rw-r--r--lld/test/elf/Mips/abi-flags-08.test6
-rw-r--r--lld/test/elf/Mips/abi-flags-09.test2
-rw-r--r--lld/test/elf/Mips/abi-flags-10.test2
-rw-r--r--lld/test/elf/Mips/abi-flags-11.test2
-rw-r--r--lld/test/elf/Mips/base-address-64.test2
-rw-r--r--lld/test/elf/Mips/base-address.test2
-rw-r--r--lld/test/elf/Mips/ctors-order.test4
-rw-r--r--lld/test/elf/Mips/driver-hash-style.test4
-rw-r--r--lld/test/elf/Mips/dt-textrel-64.test4
-rw-r--r--lld/test/elf/Mips/dt-textrel.test4
-rw-r--r--lld/test/elf/Mips/dynamic-linking.test6
-rw-r--r--lld/test/elf/Mips/dynamic-sym.test4
-rw-r--r--lld/test/elf/Mips/dynlib-dynamic.test2
-rw-r--r--lld/test/elf/Mips/dynlib-dynsym-micro.test4
-rw-r--r--lld/test/elf/Mips/dynlib-dynsym.test4
-rw-r--r--lld/test/elf/Mips/dynlib-fileheader-64.test2
-rw-r--r--lld/test/elf/Mips/dynlib-fileheader-micro-64.test2
-rw-r--r--lld/test/elf/Mips/dynlib-fileheader-micro.test2
-rw-r--r--lld/test/elf/Mips/dynlib-fileheader.test2
-rw-r--r--lld/test/elf/Mips/dynsym-table-1.test6
-rw-r--r--lld/test/elf/Mips/dynsym-table-2.test4
-rw-r--r--lld/test/elf/Mips/e-flags-merge-1-64.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-1.test4
-rw-r--r--lld/test/elf/Mips/e-flags-merge-10.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-11.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-12.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-2-64.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-2.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-3-64.test8
-rw-r--r--lld/test/elf/Mips/e-flags-merge-3.test8
-rw-r--r--lld/test/elf/Mips/e-flags-merge-4-64.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-4.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-5-64.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-5.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-6-64.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-6.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-7-64.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-7.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-8.test2
-rw-r--r--lld/test/elf/Mips/e-flags-merge-9.test2
-rw-r--r--lld/test/elf/Mips/entry-name.test2
-rw-r--r--lld/test/elf/Mips/exe-dynamic.test4
-rw-r--r--lld/test/elf/Mips/exe-dynsym-micro.test4
-rw-r--r--lld/test/elf/Mips/exe-dynsym.test4
-rw-r--r--lld/test/elf/Mips/exe-fileheader-02.test2
-rw-r--r--lld/test/elf/Mips/exe-fileheader-03.test2
-rw-r--r--lld/test/elf/Mips/exe-fileheader-64.test2
-rw-r--r--lld/test/elf/Mips/exe-fileheader-be-64.test2
-rw-r--r--lld/test/elf/Mips/exe-fileheader-be.test2
-rw-r--r--lld/test/elf/Mips/exe-fileheader-micro-64.test2
-rw-r--r--lld/test/elf/Mips/exe-fileheader-micro.test2
-rw-r--r--lld/test/elf/Mips/exe-fileheader-n32.test2
-rw-r--r--lld/test/elf/Mips/exe-fileheader.test4
-rw-r--r--lld/test/elf/Mips/exe-got-micro.test4
-rw-r--r--lld/test/elf/Mips/exe-got.test4
-rw-r--r--lld/test/elf/Mips/got-page-32-micro.test4
-rw-r--r--lld/test/elf/Mips/got-page-32.test4
-rw-r--r--lld/test/elf/Mips/got-page-64-micro.test4
-rw-r--r--lld/test/elf/Mips/got-page-64.test4
-rw-r--r--lld/test/elf/Mips/got16-2.test2
-rw-r--r--lld/test/elf/Mips/got16-micro.test4
-rw-r--r--lld/test/elf/Mips/got16.test4
-rw-r--r--lld/test/elf/Mips/gotsym.test4
-rw-r--r--lld/test/elf/Mips/gp-sym-1-micro.test4
-rw-r--r--lld/test/elf/Mips/gp-sym-1.test4
-rw-r--r--lld/test/elf/Mips/gp-sym-2.test6
-rw-r--r--lld/test/elf/Mips/hilo16-1.test2
-rw-r--r--lld/test/elf/Mips/hilo16-2.test2
-rw-r--r--lld/test/elf/Mips/hilo16-3-overflow.test2
-rw-r--r--lld/test/elf/Mips/hilo16-3.test2
-rw-r--r--lld/test/elf/Mips/hilo16-4.test2
-rw-r--r--lld/test/elf/Mips/hilo16-5.test4
-rw-r--r--lld/test/elf/Mips/hilo16-8-micro.test2
-rw-r--r--lld/test/elf/Mips/hilo16-9-micro.test2
-rw-r--r--lld/test/elf/Mips/initfini-micro.test2
-rw-r--r--lld/test/elf/Mips/interpreter-64.test2
-rw-r--r--lld/test/elf/Mips/interpreter-n32.test2
-rw-r--r--lld/test/elf/Mips/interpreter.test2
-rw-r--r--lld/test/elf/Mips/invalid-reginfo.test2
-rw-r--r--lld/test/elf/Mips/jalx-align-err.test2
-rw-r--r--lld/test/elf/Mips/jalx-jalr.test2
-rw-r--r--lld/test/elf/Mips/jalx.test2
-rw-r--r--lld/test/elf/Mips/jump-fix-err.test2
-rw-r--r--lld/test/elf/Mips/la25-stub-be.test2
-rw-r--r--lld/test/elf/Mips/la25-stub-micro-be.test2
-rw-r--r--lld/test/elf/Mips/la25-stub-micro.test2
-rw-r--r--lld/test/elf/Mips/la25-stub-npic-01.test2
-rw-r--r--lld/test/elf/Mips/la25-stub-npic-02.test2
-rw-r--r--lld/test/elf/Mips/la25-stub-npic-shared.test4
-rw-r--r--lld/test/elf/Mips/la25-stub-pic.test2
-rw-r--r--lld/test/elf/Mips/la25-stub.test2
-rw-r--r--lld/test/elf/Mips/mips-options-01.test2
-rw-r--r--lld/test/elf/Mips/mips-options-02.test2
-rw-r--r--lld/test/elf/Mips/mips-options-03.test2
-rw-r--r--lld/test/elf/Mips/mips-options-04.test4
-rw-r--r--lld/test/elf/Mips/mips-options-05.test2
-rw-r--r--lld/test/elf/Mips/mips-options-gp0.test2
-rw-r--r--lld/test/elf/Mips/n32-rela-chain.test2
-rw-r--r--lld/test/elf/Mips/n64-rel-chain.test4
-rw-r--r--lld/test/elf/Mips/n64-rel-shift.test2
-rw-r--r--lld/test/elf/Mips/opt-emulation.test4
-rw-r--r--lld/test/elf/Mips/pc23-range.test2
-rw-r--r--lld/test/elf/Mips/plt-entry-mixed-1.test4
-rw-r--r--lld/test/elf/Mips/plt-entry-mixed-2.test4
-rw-r--r--lld/test/elf/Mips/plt-entry-mixed-3.test4
-rw-r--r--lld/test/elf/Mips/plt-entry-mixed-4.test4
-rw-r--r--lld/test/elf/Mips/plt-entry-r6-be.test4
-rw-r--r--lld/test/elf/Mips/plt-entry-r6.test4
-rw-r--r--lld/test/elf/Mips/plt-header-be.test4
-rw-r--r--lld/test/elf/Mips/plt-header-micro-be.test4
-rw-r--r--lld/test/elf/Mips/plt-header-micro.test4
-rw-r--r--lld/test/elf/Mips/plt-header-mixed.test4
-rw-r--r--lld/test/elf/Mips/plt-header.test4
-rw-r--r--lld/test/elf/Mips/r26-1-micro.test4
-rw-r--r--lld/test/elf/Mips/r26-1.test4
-rw-r--r--lld/test/elf/Mips/r26-2-micro.test2
-rw-r--r--lld/test/elf/Mips/r26-2.test2
-rw-r--r--lld/test/elf/Mips/reginfo-01.test2
-rw-r--r--lld/test/elf/Mips/reginfo-02.test2
-rw-r--r--lld/test/elf/Mips/reginfo-03.test2
-rw-r--r--lld/test/elf/Mips/reginfo-04.test4
-rw-r--r--lld/test/elf/Mips/reginfo-05.test2
-rw-r--r--lld/test/elf/Mips/rel-16-overflow.test2
-rw-r--r--lld/test/elf/Mips/rel-16.test2
-rw-r--r--lld/test/elf/Mips/rel-32-be.test2
-rw-r--r--lld/test/elf/Mips/rel-32.test2
-rw-r--r--lld/test/elf/Mips/rel-64.test2
-rw-r--r--lld/test/elf/Mips/rel-call-hilo-01.test4
-rw-r--r--lld/test/elf/Mips/rel-call-hilo-micro.test4
-rw-r--r--lld/test/elf/Mips/rel-copy-micro.test6
-rw-r--r--lld/test/elf/Mips/rel-copy-pc.test4
-rw-r--r--lld/test/elf/Mips/rel-copy.test6
-rw-r--r--lld/test/elf/Mips/rel-dynamic-01-micro.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-01.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-02.test2
-rw-r--r--lld/test/elf/Mips/rel-dynamic-03-micro.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-03.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-04-micro.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-04.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-05-micro.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-05.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-06-64.test2
-rw-r--r--lld/test/elf/Mips/rel-dynamic-06.test2
-rw-r--r--lld/test/elf/Mips/rel-dynamic-07-64.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-07.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-08-64.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-08-micro.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-08.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-09-micro.test2
-rw-r--r--lld/test/elf/Mips/rel-dynamic-09.test2
-rw-r--r--lld/test/elf/Mips/rel-dynamic-10-micro.test2
-rw-r--r--lld/test/elf/Mips/rel-dynamic-10.test2
-rw-r--r--lld/test/elf/Mips/rel-dynamic-11.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-12.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-13.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-14.test4
-rw-r--r--lld/test/elf/Mips/rel-dynamic-15.test2
-rw-r--r--lld/test/elf/Mips/rel-eh-01.test4
-rw-r--r--lld/test/elf/Mips/rel-eh-02.test4
-rw-r--r--lld/test/elf/Mips/rel-eh-03.test2
-rw-r--r--lld/test/elf/Mips/rel-got-hilo-01.test4
-rw-r--r--lld/test/elf/Mips/rel-got-hilo-micro.test4
-rw-r--r--lld/test/elf/Mips/rel-gprel16-micro-overflow.test2
-rw-r--r--lld/test/elf/Mips/rel-gprel16-micro.test2
-rw-r--r--lld/test/elf/Mips/rel-gprel16-overflow.test2
-rw-r--r--lld/test/elf/Mips/rel-gprel16.test2
-rw-r--r--lld/test/elf/Mips/rel-gprel32-64.test4
-rw-r--r--lld/test/elf/Mips/rel-gprel32.test2
-rw-r--r--lld/test/elf/Mips/rel-gprel7-micro-overflow.test2
-rw-r--r--lld/test/elf/Mips/rel-gprel7-micro.test2
-rw-r--r--lld/test/elf/Mips/rel-hi0-lo16-micro.test2
-rw-r--r--lld/test/elf/Mips/rel-high-01.test2
-rw-r--r--lld/test/elf/Mips/rel-high-02.test2
-rw-r--r--lld/test/elf/Mips/rel-jalr-01.test4
-rw-r--r--lld/test/elf/Mips/rel-jalr-02.test2
-rw-r--r--lld/test/elf/Mips/rel-lit-micro.test2
-rw-r--r--lld/test/elf/Mips/rel-lit.test2
-rw-r--r--lld/test/elf/Mips/rel-pc-hilo.test2
-rw-r--r--lld/test/elf/Mips/rel-pc16-align.test2
-rw-r--r--lld/test/elf/Mips/rel-pc16-overflow.test2
-rw-r--r--lld/test/elf/Mips/rel-pc16.test2
-rw-r--r--lld/test/elf/Mips/rel-pc18-s3-align.test2
-rw-r--r--lld/test/elf/Mips/rel-pc18-s3-micro.test2
-rw-r--r--lld/test/elf/Mips/rel-pc18-s3.test2
-rw-r--r--lld/test/elf/Mips/rel-pc19-s2-align.test2
-rw-r--r--lld/test/elf/Mips/rel-pc19-s2-micro.test2
-rw-r--r--lld/test/elf/Mips/rel-pc19-s2.test2
-rw-r--r--lld/test/elf/Mips/rel-pc21-s2-align.test2
-rw-r--r--lld/test/elf/Mips/rel-pc21-s2-micro.test2
-rw-r--r--lld/test/elf/Mips/rel-pc21-s2-overflow.test2
-rw-r--r--lld/test/elf/Mips/rel-pc21-s2.test2
-rw-r--r--lld/test/elf/Mips/rel-pc26-s2-align.test2
-rw-r--r--lld/test/elf/Mips/rel-pc26-s2-micro.test2
-rw-r--r--lld/test/elf/Mips/rel-pc26-s2.test2
-rw-r--r--lld/test/elf/Mips/rel-pc32.test2
-rw-r--r--lld/test/elf/Mips/rel-pc7-10-16-23.test2
-rw-r--r--lld/test/elf/Mips/rel-sub-micro.test2
-rw-r--r--lld/test/elf/Mips/rel-sub.test2
-rw-r--r--lld/test/elf/Mips/rld_map.test6
-rw-r--r--lld/test/elf/Mips/sign-rela.test2
-rw-r--r--lld/test/elf/Mips/st-other.test4
-rw-r--r--lld/test/elf/Mips/static-01.test2
-rw-r--r--lld/test/elf/Mips/tls-1-micro.test2
-rw-r--r--lld/test/elf/Mips/tls-1.test2
-rw-r--r--lld/test/elf/Mips/tls-2-64-static.test2
-rw-r--r--lld/test/elf/Mips/tls-2-64.test2
-rw-r--r--lld/test/elf/Mips/tls-2-micro.test2
-rw-r--r--lld/test/elf/Mips/tls-2-static.test2
-rw-r--r--lld/test/elf/Mips/tls-2.test2
-rw-r--r--lld/test/elf/Mips/tls-3-64-static.test2
-rw-r--r--lld/test/elf/Mips/tls-3-micro.test4
-rw-r--r--lld/test/elf/Mips/tls-3-static.test2
-rw-r--r--lld/test/elf/Mips/tls-3.test4
-rw-r--r--lld/test/elf/Mips/tls-4-64-static.test2
-rw-r--r--lld/test/elf/Mips/tls-4-micro.test2
-rw-r--r--lld/test/elf/Mips/tls-4-static.test2
-rw-r--r--lld/test/elf/Mips/tls-4.test2
-rw-r--r--lld/test/elf/Mips/tls-5-64.test2
-rw-r--r--lld/test/elf/Mips/tls-5-micro.test2
-rw-r--r--lld/test/elf/Mips/tls-5.test2
-rw-r--r--lld/test/elf/Mips/validate-rel-01.test4
-rw-r--r--lld/test/elf/Mips/validate-rel-03.test2
-rw-r--r--lld/test/elf/X86_64/ExampleTarget/triple.test2
-rw-r--r--lld/test/elf/X86_64/alignoffset.test2
-rw-r--r--lld/test/elf/X86_64/debug.test4
-rw-r--r--lld/test/elf/X86_64/defsym.test2
-rw-r--r--lld/test/elf/X86_64/demangle.test6
-rw-r--r--lld/test/elf/X86_64/dontignorezerosize-sections.test2
-rw-r--r--lld/test/elf/X86_64/dynamicvars.test2
-rw-r--r--lld/test/elf/X86_64/dynlib-nointerp-section.test2
-rw-r--r--lld/test/elf/X86_64/dynlib-search.test2
-rw-r--r--lld/test/elf/X86_64/dynsym-weak.test8
-rw-r--r--lld/test/elf/X86_64/extern-tls.test2
-rw-r--r--lld/test/elf/X86_64/general-dynamic-tls.test4
-rw-r--r--lld/test/elf/X86_64/imagebase.test2
-rw-r--r--lld/test/elf/X86_64/initfini-order.test2
-rw-r--r--lld/test/elf/X86_64/initfini.test2
-rw-r--r--lld/test/elf/X86_64/largebss.test2
-rw-r--r--lld/test/elf/X86_64/layoutpass-order.test2
-rw-r--r--lld/test/elf/X86_64/maxpagesize.test10
-rw-r--r--lld/test/elf/X86_64/mergesimilarstrings.test4
-rw-r--r--lld/test/elf/X86_64/multi-weak-layout.test2
-rw-r--r--lld/test/elf/X86_64/multi-weak-override.test4
-rw-r--r--lld/test/elf/X86_64/multi-weak-syms-order.test4
-rw-r--r--lld/test/elf/X86_64/nmagic.test2
-rw-r--r--lld/test/elf/X86_64/noalignsegments.test2
-rw-r--r--lld/test/elf/X86_64/note-sections-ro_plus_rw.test2
-rw-r--r--lld/test/elf/X86_64/note-sections.test2
-rw-r--r--lld/test/elf/X86_64/omagic.test2
-rw-r--r--lld/test/elf/X86_64/outputsegments.test4
-rw-r--r--lld/test/elf/X86_64/reloc_r_x86_64_16.test2
-rw-r--r--lld/test/elf/X86_64/reloc_r_x86_64_pc16.test2
-rw-r--r--lld/test/elf/X86_64/reloc_r_x86_64_pc64.test2
-rw-r--r--lld/test/elf/X86_64/rodata.test2
-rw-r--r--lld/test/elf/X86_64/sectionchoice.test2
-rw-r--r--lld/test/elf/X86_64/sectionmap.test2
-rw-r--r--lld/test/elf/X86_64/startGroupEndGroup.test16
-rw-r--r--lld/test/elf/X86_64/startGroupEndGroupWithDynlib.test2
-rw-r--r--lld/test/elf/X86_64/staticlib-search.test2
-rw-r--r--lld/test/elf/X86_64/undef.test4
-rw-r--r--lld/test/elf/X86_64/underscore-end.test4
-rw-r--r--lld/test/elf/X86_64/weak-override.test4
-rw-r--r--lld/test/elf/X86_64/weak-zero-sized.test4
-rw-r--r--lld/test/elf/X86_64/weaksym.test2
-rw-r--r--lld/test/elf/X86_64/yamlinput.test4
-rw-r--r--lld/test/elf/abs-dup.objtxt2
-rw-r--r--lld/test/elf/abs.test2
-rw-r--r--lld/test/elf/allowduplicates.objtxt6
-rw-r--r--lld/test/elf/archive-elf-forceload.test2
-rw-r--r--lld/test/elf/archive-elf.test2
-rw-r--r--lld/test/elf/as-needed.test4
-rw-r--r--lld/test/elf/branch.test4
-rw-r--r--lld/test/elf/check.test4
-rw-r--r--lld/test/elf/checkrodata.test4
-rw-r--r--lld/test/elf/common.test2
-rw-r--r--lld/test/elf/consecutive-weak-sym-defs.test2
-rw-r--r--lld/test/elf/defsym.objtxt6
-rw-r--r--lld/test/elf/discard-all.test2
-rw-r--r--lld/test/elf/discard-locals.test2
-rw-r--r--lld/test/elf/dynamic-segorder.test2
-rw-r--r--lld/test/elf/dynamic-undef.test10
-rw-r--r--lld/test/elf/dynamic.test4
-rw-r--r--lld/test/elf/eh_frame_hdr.test2
-rw-r--r--lld/test/elf/entry.objtxt2
-rw-r--r--lld/test/elf/export-dynamic.test2
-rw-r--r--lld/test/elf/filenotfound.test2
-rw-r--r--lld/test/elf/gnulinkonce/gnulinkonce-report-discarded-reference.test4
-rw-r--r--lld/test/elf/gnulinkonce/gnulinkonce-report-undef.test4
-rw-r--r--lld/test/elf/gnulinkonce/gnulinkonce.test4
-rw-r--r--lld/test/elf/gotpcrel.test2
-rw-r--r--lld/test/elf/gottpoff.test2
-rw-r--r--lld/test/elf/group-cmd-search.test20
-rw-r--r--lld/test/elf/hexagon-quickdata-sort.test2
-rw-r--r--lld/test/elf/hexagon-quickdata-sortcommon.test2
-rw-r--r--lld/test/elf/ifunc.test8
-rw-r--r--lld/test/elf/ignore-unknownoption.test2
-rw-r--r--lld/test/elf/init_array-order.test2
-rw-r--r--lld/test/elf/init_array.test2
-rw-r--r--lld/test/elf/initfini-options.test-1.test2
-rw-r--r--lld/test/elf/initfini-options.test-2.test2
-rw-r--r--lld/test/elf/initfini-options.test-3.test2
-rw-r--r--lld/test/elf/librarynotfound.test2
-rw-r--r--lld/test/elf/linkerscript/externs.objtxt2
-rw-r--r--lld/test/elf/linkerscript/filename-with-wildcards.test2
-rw-r--r--lld/test/elf/linkerscript/invalid-script-cli-1.test4
-rw-r--r--lld/test/elf/linkerscript/invalid-script-cli-2.test2
-rw-r--r--lld/test/elf/linkerscript/invalid.test2
-rw-r--r--lld/test/elf/linkerscript/phdrs-all-none.test2
-rw-r--r--lld/test/elf/linkerscript/phdrs-custom-none.test2
-rw-r--r--lld/test/elf/linkerscript/phdrs-default.test8
-rw-r--r--lld/test/elf/linkerscript/phdrs-different.test2
-rw-r--r--lld/test/elf/linkerscript/phdrs-extra-program.test2
-rw-r--r--lld/test/elf/linkerscript/phdrs-flags.test2
-rw-r--r--lld/test/elf/linkerscript/phdrs-has-program.test2
-rw-r--r--lld/test/elf/linkerscript/phdrs-invalid.test6
-rw-r--r--lld/test/elf/linkerscript/phdrs-misplaced-program.test2
-rw-r--r--lld/test/elf/linkerscript/phdrs-no-program.test2
-rw-r--r--lld/test/elf/linkerscript/phdrs-one-none.test2
-rw-r--r--lld/test/elf/linkerscript/phdrs-program-flags.test2
-rw-r--r--lld/test/elf/linkerscript/phdrs-program-good-phdrs.test2
-rw-r--r--lld/test/elf/linkerscript/phdrs-program-no-phdrs.test2
-rw-r--r--lld/test/elf/linkerscript/phdrs-program-wrong-phdrs.test2
-rw-r--r--lld/test/elf/linkerscript/phdrs-same-flags.test2
-rw-r--r--lld/test/elf/linkerscript/phdrs-same.test2
-rw-r--r--lld/test/elf/linkerscript/sections-order.test2
-rw-r--r--lld/test/elf/linkerscript/sections-with-wildcards.test2
-rw-r--r--lld/test/elf/linkerscript/symbol-definition-so.test2
-rw-r--r--lld/test/elf/linkerscript/symbol-definition.test2
-rw-r--r--lld/test/elf/linkerscript/valid-script-cli.objtxt8
-rw-r--r--lld/test/elf/loginputfiles.test2
-rw-r--r--lld/test/elf/mergeatoms.test2
-rw-r--r--lld/test/elf/mergeconstants.test2
-rw-r--r--lld/test/elf/mergeglobalatoms.test2
-rw-r--r--lld/test/elf/no-unique-section-names.test2
-rw-r--r--lld/test/elf/note.test2
-rw-r--r--lld/test/elf/options/dynamic-linker.test6
-rw-r--r--lld/test/elf/options/target-specific-args.test2
-rw-r--r--lld/test/elf/phdr.test4
-rw-r--r--lld/test/elf/quickdata.test2
-rw-r--r--lld/test/elf/reloc.test2
-rw-r--r--lld/test/elf/responsefile.test2
-rw-r--r--lld/test/elf/rodata.test2
-rw-r--r--lld/test/elf/rosegment.test4
-rw-r--r--lld/test/elf/sectionGroups/sectiongroup-new-members.test4
-rw-r--r--lld/test/elf/sectionGroups/sectiongroup-simple.test4
-rw-r--r--lld/test/elf/sectionGroups/sectiongroup-undef-member-other.test2
-rw-r--r--lld/test/elf/sectionGroups/sectiongroup-undef-member.test2
-rw-r--r--lld/test/elf/sectionGroups/sectiongroup-with-globalsymbols.test4
-rw-r--r--lld/test/elf/sectionGroups/sectiongroup-with-undef-external-reference.test4
-rw-r--r--lld/test/elf/sectionGroups/sectiongroup-with-undef-signature.test4
-rw-r--r--lld/test/elf/sections.test2
-rw-r--r--lld/test/elf/sh_addralign.test2
-rw-r--r--lld/test/elf/shndx.test2
-rw-r--r--lld/test/elf/soname.test2
-rw-r--r--lld/test/elf/start-stop-sym.test2
-rw-r--r--lld/test/elf/strip-all.test2
-rw-r--r--lld/test/elf/stripped-empty.test2
-rw-r--r--lld/test/elf/symbols.test4
-rw-r--r--lld/test/elf/tls-tbss-size.test2
-rw-r--r--lld/test/elf/tls.test4
-rw-r--r--lld/test/elf/tlsAddr.test2
-rw-r--r--lld/test/elf/undef-from-dso-to-main.test4
-rw-r--r--lld/test/elf/undef-from-main-dso.test4
-rw-r--r--lld/test/elf/weaksym.test2
-rw-r--r--lld/test/elf/wrap.test4
-rw-r--r--lld/test/elf/x86-64-dynamic-relocs.test2
-rw-r--r--lld/test/elf/x86-64-dynamic.test4
-rw-r--r--lld/test/elf/x86.test2
-rw-r--r--lld/test/elf/x86_64-kinds.test4
-rw-r--r--lld/test/elf/zoption_dtflags.test2
462 files changed, 696 insertions, 696 deletions
diff --git a/lld/lib/Driver/UniversalDriver.cpp b/lld/lib/Driver/UniversalDriver.cpp
index e2d6b70eed3..c001d11ce16 100644
--- a/lld/lib/Driver/UniversalDriver.cpp
+++ b/lld/lib/Driver/UniversalDriver.cpp
@@ -68,11 +68,11 @@ public:
enum class Flavor {
invalid,
- gnu_ld, // -flavor gnu
- gnu_ld2, // -flavor gnu2
- win_link, // -flavor link
- darwin_ld, // -flavor darwin
- core // -flavor core OR -core
+ old_gnu_ld, // -flavor old-gnu
+ gnu_ld2, // -flavor gnu2
+ win_link, // -flavor link
+ darwin_ld, // -flavor darwin
+ core // -flavor core OR -core
};
struct ProgramNameParts {
@@ -84,14 +84,14 @@ struct ProgramNameParts {
static Flavor strToFlavor(StringRef str) {
return llvm::StringSwitch<Flavor>(str)
- .Case("gnu", Flavor::gnu_ld)
+ .Case("old-gnu", Flavor::old_gnu_ld)
.Case("gnu2", Flavor::gnu_ld2)
.Case("ld.lld2", Flavor::gnu_ld2)
.Case("link", Flavor::win_link)
.Case("lld-link", Flavor::win_link)
.Case("darwin", Flavor::darwin_ld)
.Case("core", Flavor::core)
- .Case("ld", Flavor::gnu_ld)
+ .Case("ld", Flavor::old_gnu_ld)
.Default(Flavor::invalid);
}
@@ -153,7 +153,7 @@ static Flavor getFlavor(llvm::MutableArrayRef<const char *> &args,
return Flavor::darwin_ld;
#endif
// On a ELF based systems, if linker binary is named "ld", use gnu driver.
- return Flavor::gnu_ld;
+ return Flavor::old_gnu_ld;
}
#endif
@@ -202,7 +202,7 @@ bool UniversalDriver::link(llvm::MutableArrayRef<const char *> args,
// Switch to appropriate driver.
switch (flavor) {
- case Flavor::gnu_ld:
+ case Flavor::old_gnu_ld:
return GnuLdDriver::linkELF(args, diagnostics);
case Flavor::gnu_ld2:
elf2::link(args);
diff --git a/lld/test/Driver/def-lib-search.test b/lld/test/Driver/def-lib-search.test
index abd4d0204b0..15d5dbbea9f 100644
--- a/lld/test/Driver/def-lib-search.test
+++ b/lld/test/Driver/def-lib-search.test
@@ -1,7 +1,7 @@
# Check that search paths explicitly provided by the -L option
# are used in search before default paths.
-RUN: not lld -flavor gnu -target x86_64 -t -ltest \
+RUN: not lld -flavor old-gnu -target x86_64 -t -ltest \
RUN: --sysroot=%p/Inputs -L%p/Inputs 2> %t
RUN: FileCheck %s < %t
diff --git a/lld/test/Driver/flavor-option.test b/lld/test/Driver/flavor-option.test
index 2ca3b410cbe..2471bc09519 100644
--- a/lld/test/Driver/flavor-option.test
+++ b/lld/test/Driver/flavor-option.test
@@ -2,7 +2,7 @@
# argument in the command line (bug 20975);
# b) UniversalDriver correctly removes -flavor along with its value and the
# underlying linker does not get a corrupted command line (bug 20977).
-RUN: lld --help -flavor gnu | FileCheck %s
+RUN: lld --help -flavor old-gnu | FileCheck %s
CHECK: --noinhibit-exec
CHECK: --output-filetype
diff --git a/lld/test/Driver/lib-search.test b/lld/test/Driver/lib-search.test
index 9d3666f63c3..255b17b1a55 100644
--- a/lld/test/Driver/lib-search.test
+++ b/lld/test/Driver/lib-search.test
@@ -1,16 +1,16 @@
-RUN: not lld -flavor gnu -t -ltest -L%p/Inputs 2> %t.err
+RUN: not lld -flavor old-gnu -t -ltest -L%p/Inputs 2> %t.err
RUN: FileCheck %s < %t.err
-RUN: not lld -flavor gnu -target x86_64--netbsd -t -ltest \
+RUN: not lld -flavor old-gnu -target x86_64--netbsd -t -ltest \
RUN: --sysroot=%p/Inputs 2> %t2
RUN: FileCheck -check-prefix=NETBSD-AMD64 %s < %t2
-RUN: not lld -flavor gnu -target x86_64--netbsd -nostdlib -t -ltest \
+RUN: not lld -flavor old-gnu -target x86_64--netbsd -nostdlib -t -ltest \
RUN: --sysroot=%p/Inputs 2> %t3
RUN: FileCheck -check-prefix=NETBSD-AMD64-NS %s < %t3
-RUN: not lld -flavor gnu -target i386--netbsd -t -ltest \
+RUN: not lld -flavor old-gnu -target i386--netbsd -t -ltest \
RUN: --sysroot=%p/Inputs 2> %t4
RUN: FileCheck -check-prefix=NETBSD-I386 %s < %t4
-RUN: not lld -flavor gnu -target x86_64--netbsd -m elf_i386 -t -ltest \
+RUN: not lld -flavor old-gnu -target x86_64--netbsd -m elf_i386 -t -ltest \
RUN: --sysroot=%p/Inputs 2> %t5
RUN: FileCheck -check-prefix=NETBSD-AMD64_32 %s < %t5
diff --git a/lld/test/Driver/so-whole-archive.test b/lld/test/Driver/so-whole-archive.test
index 0732c35a7a9..8ab879082bf 100644
--- a/lld/test/Driver/so-whole-archive.test
+++ b/lld/test/Driver/so-whole-archive.test
@@ -3,8 +3,8 @@
# RUN: yaml2obj -format=elf -docnum=1 %s > %t-so.o
# RUN: yaml2obj -format=elf -docnum=2 %s > %t-exe.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
-# RUN: lld -flavor gnu -target mipsel -o %t.exe %t-exe.o --whole-archive %t.so
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -o %t.exe %t-exe.o --whole-archive %t.so
# so.o
---
diff --git a/lld/test/Driver/trivial-driver.test b/lld/test/Driver/trivial-driver.test
index 196d6cfa9d4..46de60c543f 100644
--- a/lld/test/Driver/trivial-driver.test
+++ b/lld/test/Driver/trivial-driver.test
@@ -1,5 +1,5 @@
# This test, tests the Gnu lld option --help
-RUN: lld -flavor gnu --help | FileCheck %s
+RUN: lld -flavor old-gnu --help | FileCheck %s
CHECK: --noinhibit-exec
CHECK: --output-filetype
diff --git a/lld/test/Driver/undef-basic.objtxt b/lld/test/Driver/undef-basic.objtxt
index f942d5c8e90..7b11a7e8c98 100644
--- a/lld/test/Driver/undef-basic.objtxt
+++ b/lld/test/Driver/undef-basic.objtxt
@@ -1,4 +1,4 @@
-# RUN: lld -flavor gnu -u undefinedsymbol -e entrysymbol %s \
+# RUN: lld -flavor old-gnu -u undefinedsymbol -e entrysymbol %s \
# RUN: --output-filetype=yaml --noinhibit-exec | FileCheck %s
#
diff --git a/lld/test/elf/AArch64/defsym.test b/lld/test/elf/AArch64/defsym.test
index 8bf492d4a38..f9864092ddc 100644
--- a/lld/test/elf/AArch64/defsym.test
+++ b/lld/test/elf/AArch64/defsym.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target aarch64--linux-gnu --defsym=main=fn \
+RUN: lld -flavor old-gnu -target aarch64--linux-gnu --defsym=main=fn \
RUN: --noinhibit-exec %p/Inputs/fn.o -o %t
RUN: llvm-readobj -symbols %t | FileCheck %s
diff --git a/lld/test/elf/AArch64/dontignorezerosize-sections.test b/lld/test/elf/AArch64/dontignorezerosize-sections.test
index ac593abcc36..8f3b2770220 100644
--- a/lld/test/elf/AArch64/dontignorezerosize-sections.test
+++ b/lld/test/elf/AArch64/dontignorezerosize-sections.test
@@ -1,5 +1,5 @@
# This tests that lld is not ignoring zero sized sections
-RUN: lld -flavor gnu -target aarch64--linux-gnu %p/Inputs/zerosizedsection.o \
+RUN: lld -flavor old-gnu -target aarch64--linux-gnu %p/Inputs/zerosizedsection.o \
RUN: --noinhibit-exec --output-filetype=yaml -o %t
RUN: FileCheck %s < %t
diff --git a/lld/test/elf/AArch64/dynamicvars.test b/lld/test/elf/AArch64/dynamicvars.test
index 0b6db63e873..80228f0cd4b 100644
--- a/lld/test/elf/AArch64/dynamicvars.test
+++ b/lld/test/elf/AArch64/dynamicvars.test
@@ -2,7 +2,7 @@
# values.
# RUN: yaml2obj --format elf -docnum 1 %s -o %t.o
-# RUN: lld -flavor gnu -target aarch64 -e main %t.o -o %t1 --noinhibit-exec
+# RUN: lld -flavor old-gnu -target aarch64 -e main %t.o -o %t1 --noinhibit-exec
# RUN: llvm-readobj -sections -symbols %t1 | FileCheck %s
diff --git a/lld/test/elf/AArch64/dynlib-nointerp-section.test b/lld/test/elf/AArch64/dynlib-nointerp-section.test
index 9365b4d5b3e..c4f4edab61b 100644
--- a/lld/test/elf/AArch64/dynlib-nointerp-section.test
+++ b/lld/test/elf/AArch64/dynlib-nointerp-section.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target aarch64--linux-gnu %p/Inputs/no-interp-section.o \
+RUN: lld -flavor old-gnu -target aarch64--linux-gnu %p/Inputs/no-interp-section.o \
RUN: -o %t -shared
RUN: llvm-objdump -section-headers %t | FileCheck %s
diff --git a/lld/test/elf/AArch64/general-dyn-tls-0.test b/lld/test/elf/AArch64/general-dyn-tls-0.test
index 306cf7ca044..ae2af94d057 100644
--- a/lld/test/elf/AArch64/general-dyn-tls-0.test
+++ b/lld/test/elf/AArch64/general-dyn-tls-0.test
@@ -25,7 +25,7 @@
#RUN: yaml2obj -format=elf %p/Inputs/general-dyn-tls-0.yaml -o=%t-t1.o
#RUN: yaml2obj -format=elf %s -o %t-t0.o
-#RUN: lld -flavor gnu -target arm64 --noinhibit-exec -o %t.exe %t-t0.o %t-t1.o
+#RUN: lld -flavor old-gnu -target arm64 --noinhibit-exec -o %t.exe %t-t0.o %t-t1.o
#RUN: llvm-readobj -relocations %t.exe | FileCheck %s -check-prefix=CHECKRELOCATION
#RUN: llvm-objdump -s -t %t.exe | FileCheck %s
diff --git a/lld/test/elf/AArch64/initfini.test b/lld/test/elf/AArch64/initfini.test
index 887e44ea105..c5f385082ed 100644
--- a/lld/test/elf/AArch64/initfini.test
+++ b/lld/test/elf/AArch64/initfini.test
@@ -3,7 +3,7 @@
# corresponds to the the .init_array/.fini_array sections
# in the output ELF.
-RUN: lld -flavor gnu -target aarch64--linux-gnu %p/Inputs/initfini.o \
+RUN: lld -flavor old-gnu -target aarch64--linux-gnu %p/Inputs/initfini.o \
RUN: --noinhibit-exec --output-filetype=yaml -o %t
RUN: FileCheck %s < %t
diff --git a/lld/test/elf/AArch64/initial-exec-tls-0.test b/lld/test/elf/AArch64/initial-exec-tls-0.test
index 65185e4b988..4cb5f9c7052 100644
--- a/lld/test/elf/AArch64/initial-exec-tls-0.test
+++ b/lld/test/elf/AArch64/initial-exec-tls-0.test
@@ -29,7 +29,7 @@
#RUN: yaml2obj -format=elf %p/Inputs/initial-exec-tls-1.yaml -o=%t-t1.o
#RUN: yaml2obj -format=elf %s -o %t-t0.o
-#RUN: lld -flavor gnu -target arm64 --noinhibit-exec -o %t.exe %t-t0.o %t-t1.o
+#RUN: lld -flavor old-gnu -target arm64 --noinhibit-exec -o %t.exe %t-t0.o %t-t1.o
#RUN: llvm-readobj -relocations %t.exe | FileCheck %s -check-prefix=CHECKRELOCATION
#RUN: llvm-objdump -s -t %t.exe | FileCheck %s
diff --git a/lld/test/elf/AArch64/local-tls.test b/lld/test/elf/AArch64/local-tls.test
index 0fbb4666b72..f339ae20e15 100644
--- a/lld/test/elf/AArch64/local-tls.test
+++ b/lld/test/elf/AArch64/local-tls.test
@@ -1,7 +1,7 @@
# Check for correct offsets when handling relocations for local TLS
# access (R_AARCH64_TLSLE_ADD_TPREL_HI12, R_AARCH64_TLSLE_ADD_TPREL_LO12_NC)
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target arm64 --noinhibit-exec -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target arm64 --noinhibit-exec -o %t-exe %t-obj
# RUN: llvm-objdump -s -t %t-exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/AArch64/rel-abs16-overflow.test b/lld/test/elf/AArch64/rel-abs16-overflow.test
index f9907ac5c86..06221c902bd 100644
--- a/lld/test/elf/AArch64/rel-abs16-overflow.test
+++ b/lld/test/elf/AArch64/rel-abs16-overflow.test
@@ -1,6 +1,6 @@
# Check handling of R_AARCH64_ABS16 relocation overflow.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: not lld -flavor gnu -target arm64 -o %t-exe %t-obj 2>&1 | FileCheck %s
+# RUN: not lld -flavor old-gnu -target arm64 -o %t-exe %t-obj 2>&1 | FileCheck %s
# CHECK: Relocation out of range in file {{.*}}: reference from data1+0 to data1+0 of type 259 (R_AARCH64_ABS16)
diff --git a/lld/test/elf/AArch64/rel-abs16.test b/lld/test/elf/AArch64/rel-abs16.test
index 1b7a67d41b8..e6b817570eb 100644
--- a/lld/test/elf/AArch64/rel-abs16.test
+++ b/lld/test/elf/AArch64/rel-abs16.test
@@ -1,6 +1,6 @@
# Check handling of R_AARCH64_ABS16 relocation.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target arm64 -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target arm64 -o %t-exe %t-obj
# RUN: llvm-objdump -s -t %t-exe | FileCheck %s
# CHECK: Contents of section .data:
diff --git a/lld/test/elf/AArch64/rel-abs32-overflow.test b/lld/test/elf/AArch64/rel-abs32-overflow.test
index e32fce173c5..17154c6ddc8 100644
--- a/lld/test/elf/AArch64/rel-abs32-overflow.test
+++ b/lld/test/elf/AArch64/rel-abs32-overflow.test
@@ -1,6 +1,6 @@
# Check handling of R_AARCH64_ABS32 relocation overflow.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: not lld -flavor gnu -target arm64 -o %t-exe %t-obj 2>&1 | FileCheck %s
+# RUN: not lld -flavor old-gnu -target arm64 -o %t-exe %t-obj 2>&1 | FileCheck %s
# CHECK-DAG: Relocation out of range in file {{.*}}: reference from data1+0 to data2+34359738369 of type 258 (R_AARCH64_ABS32)
# CHECK-DAG: Relocation out of range in file {{.*}}: reference from data2+0 to data1+34359738369 of type 258 (R_AARCH64_ABS32)
diff --git a/lld/test/elf/AArch64/rel-abs32.test b/lld/test/elf/AArch64/rel-abs32.test
index edd7b69e428..7faa662d346 100644
--- a/lld/test/elf/AArch64/rel-abs32.test
+++ b/lld/test/elf/AArch64/rel-abs32.test
@@ -1,6 +1,6 @@
# Check handling of R_AARCH64_ABS32 relocation.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target arm64 -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target arm64 -o %t-exe %t-obj
# RUN: llvm-objdump -s -t %t-exe | FileCheck %s
# CHECK: Contents of section .data:
diff --git a/lld/test/elf/AArch64/rel-abs64.test b/lld/test/elf/AArch64/rel-abs64.test
index c125e3f2450..0304584d121 100644
--- a/lld/test/elf/AArch64/rel-abs64.test
+++ b/lld/test/elf/AArch64/rel-abs64.test
@@ -1,6 +1,6 @@
# Check handling of R_AARCH64_ABS64 relocation.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target arm64 -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target arm64 -o %t-exe %t-obj
# RUN: llvm-objdump -s -t %t-exe | FileCheck %s
# CHECK: Contents of section .data:
diff --git a/lld/test/elf/AArch64/rel-adr_prel_lo21-overflow.test b/lld/test/elf/AArch64/rel-adr_prel_lo21-overflow.test
index 6e8ad6f4708..4f8e6b607bc 100644
--- a/lld/test/elf/AArch64/rel-adr_prel_lo21-overflow.test
+++ b/lld/test/elf/AArch64/rel-adr_prel_lo21-overflow.test
@@ -1,6 +1,6 @@
# Check handling of R_AARCH64_ADR_PREL_PG_HI21 relocation.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: not lld -flavor gnu -target arm64 -o %t-exe %t-obj
+# RUN: not lld -flavor old-gnu -target arm64 -o %t-exe %t-obj
# CHECK: Relocation out of range in file {{.*}}: reference from _start+0 to data1+1048577 of type 274 (R_AARCH64_ADR_PREL_LO21)
diff --git a/lld/test/elf/AArch64/rel-adr_prel_lo21.test b/lld/test/elf/AArch64/rel-adr_prel_lo21.test
index 9d7880caf66..36a9489c1aa 100644
--- a/lld/test/elf/AArch64/rel-adr_prel_lo21.test
+++ b/lld/test/elf/AArch64/rel-adr_prel_lo21.test
@@ -2,7 +2,7 @@
# Check handling of R_AARCH64_ADR_PREL_LO21 relocation.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target arm64 -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target arm64 -o %t-exe %t-obj
# RUN: llvm-objdump -d -t %t-exe | FileCheck %s
# CHECK: Disassembly of section .text:
diff --git a/lld/test/elf/AArch64/rel-adr_prel_pg_hi21-overflow.test b/lld/test/elf/AArch64/rel-adr_prel_pg_hi21-overflow.test
index 674c38bae73..f095f60e82a 100644
--- a/lld/test/elf/AArch64/rel-adr_prel_pg_hi21-overflow.test
+++ b/lld/test/elf/AArch64/rel-adr_prel_pg_hi21-overflow.test
@@ -1,6 +1,6 @@
# Check handling of R_AARCH64_ADR_PREL_PG_HI21 relocation overflow.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: not lld -flavor gnu -target arm64 -o %t-exe %t-obj
+# RUN: not lld -flavor old-gnu -target arm64 -o %t-exe %t-obj
# CHECK-DAG: Relocation out of range in file {{.*}}: reference from _start+0 to data1+2147483649 of type 275 (R_AARCH64_ADR_PREL_PG_HI21)
diff --git a/lld/test/elf/AArch64/rel-adr_prel_pg_hi21.test b/lld/test/elf/AArch64/rel-adr_prel_pg_hi21.test
index a07392b9bcb..36a20c2f647 100644
--- a/lld/test/elf/AArch64/rel-adr_prel_pg_hi21.test
+++ b/lld/test/elf/AArch64/rel-adr_prel_pg_hi21.test
@@ -2,7 +2,7 @@
# Check handling of R_AARCH64_ADR_PREL_PG_HI21 relocation.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target arm64 -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target arm64 -o %t-exe %t-obj
# RUN: llvm-objdump -d -t %t-exe | FileCheck %s
# CHECK: Disassembly of section .text:
diff --git a/lld/test/elf/AArch64/rel-bad.test b/lld/test/elf/AArch64/rel-bad.test
index 6b9e831146f..7d2ed192de5 100644
--- a/lld/test/elf/AArch64/rel-bad.test
+++ b/lld/test/elf/AArch64/rel-bad.test
@@ -1,6 +1,6 @@
# Check handling of a bad relocation (in this case dynamic in a static object).
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: not lld -flavor gnu -target arm64 -o %t-exe %t-obj 2>&1 | FileCheck %s
+# RUN: not lld -flavor old-gnu -target arm64 -o %t-exe %t-obj 2>&1 | FileCheck %s
# CHECK: Unhandled reference type in file {{.*}}: reference from data1+4 to data1+0 of type 1024 (R_AARCH64_COPY)
diff --git a/lld/test/elf/AArch64/rel-prel16-overflow.test b/lld/test/elf/AArch64/rel-prel16-overflow.test
index 0e9987be918..ea08f9700ee 100644
--- a/lld/test/elf/AArch64/rel-prel16-overflow.test
+++ b/lld/test/elf/AArch64/rel-prel16-overflow.test
@@ -1,6 +1,6 @@
# Check handling of R_AARCH64_PREL16 relocation overflow.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: not lld -flavor gnu -target arm64 -o %t-exe %t-obj 2>&1 | FileCheck %s
+# RUN: not lld -flavor old-gnu -target arm64 -o %t-exe %t-obj 2>&1 | FileCheck %s
# CHECK: Relocation out of range in file {{.*}}: reference from data1+0 to data2+524289 of type 262 (R_AARCH64_PREL16)
# CHECK: Relocation out of range in file {{.*}}: reference from data2+0 to data1+524289 of type 262 (R_AARCH64_PREL16)
diff --git a/lld/test/elf/AArch64/rel-prel16.test b/lld/test/elf/AArch64/rel-prel16.test
index f78d2cfafaf..11e6028e253 100644
--- a/lld/test/elf/AArch64/rel-prel16.test
+++ b/lld/test/elf/AArch64/rel-prel16.test
@@ -1,6 +1,6 @@
# Check handling of R_AARCH64_PREL16 relocation.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target arm64 -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target arm64 -o %t-exe %t-obj
# RUN: llvm-objdump -s -t %t-exe | FileCheck %s
# CHECK: Contents of section .data:
diff --git a/lld/test/elf/AArch64/rel-prel32-overflow.test b/lld/test/elf/AArch64/rel-prel32-overflow.test
index a838a7e20a1..513adad08ef 100644
--- a/lld/test/elf/AArch64/rel-prel32-overflow.test
+++ b/lld/test/elf/AArch64/rel-prel32-overflow.test
@@ -1,6 +1,6 @@
# Check handling of R_AARCH64_PREL32 relocation overflow.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: not lld -flavor gnu -target arm64 -o %t-exe %t-obj 2>&1 | FileCheck %s
+# RUN: not lld -flavor old-gnu -target arm64 -o %t-exe %t-obj 2>&1 | FileCheck %s
# CHECK: Relocation out of range in file {{.*}}: reference from data1+0 to data2+34359738369 of type 261 (R_AARCH64_PREL32)
# CHECK: Relocation out of range in file {{.*}}: reference from data2+0 to data1+34359738369 of type 261 (R_AARCH64_PREL32)
diff --git a/lld/test/elf/AArch64/rel-prel32.test b/lld/test/elf/AArch64/rel-prel32.test
index 11d235a54cf..0e178ba97f4 100644
--- a/lld/test/elf/AArch64/rel-prel32.test
+++ b/lld/test/elf/AArch64/rel-prel32.test
@@ -1,6 +1,6 @@
# Check handling of R_AARCH64_PREL32 relocation.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target arm64 -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target arm64 -o %t-exe %t-obj
# RUN: llvm-objdump -s -t %t-exe | FileCheck %s
# CHECK: Contents of section .data:
diff --git a/lld/test/elf/AArch64/rel-prel64.test b/lld/test/elf/AArch64/rel-prel64.test
index 896776da214..3a3eb8b90fc 100644
--- a/lld/test/elf/AArch64/rel-prel64.test
+++ b/lld/test/elf/AArch64/rel-prel64.test
@@ -1,6 +1,6 @@
# Check handling of R_AARCH64_PREL64 relocation.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target arm64 -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target arm64 -o %t-exe %t-obj
# RUN: llvm-objdump -s -t %t-exe | FileCheck %s
# CHECK: Contents of section .data:
diff --git a/lld/test/elf/AMDGPU/hsa.test b/lld/test/elf/AMDGPU/hsa.test
index ad3bd02ba92..4a17ae2223e 100644
--- a/lld/test/elf/AMDGPU/hsa.test
+++ b/lld/test/elf/AMDGPU/hsa.test
@@ -1,5 +1,5 @@
# RUN: yaml2obj -format=elf %s > %t.obj
-# RUN: lld -flavor gnu -target amdgcn--hsa %t.obj -o %t.exe --noinhibit-exec
+# RUN: lld -flavor old-gnu -target amdgcn--hsa %t.obj -o %t.exe --noinhibit-exec
# RUN: llvm-readobj -h -program-headers -s -symbols %t.exe | FileCheck %s
# CHECK: ElfHeader {
diff --git a/lld/test/elf/ARM/arm-symbols.test b/lld/test/elf/ARM/arm-symbols.test
index 5b6ebc76fde..ddf3c80862a 100644
--- a/lld/test/elf/ARM/arm-symbols.test
+++ b/lld/test/elf/ARM/arm-symbols.test
@@ -4,7 +4,7 @@
# 3. Symbol content.
# RUN: yaml2obj -format=elf %s > %t-a.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: -Bstatic --noinhibit-exec %t-a.o -o %t-a
# RUN: llvm-readobj -symbols %t-a | FileCheck -check-prefix=SYM-ADDR %s
# RUN: llvm-readobj -symbols %t-a | FileCheck -check-prefix=SYM-SIZE %s
diff --git a/lld/test/elf/ARM/defsym.test b/lld/test/elf/ARM/defsym.test
index 89debeb1eb6..7d4fa7fcd4d 100644
--- a/lld/test/elf/ARM/defsym.test
+++ b/lld/test/elf/ARM/defsym.test
@@ -1,7 +1,7 @@
# Check that defined symbols are present in the generated executable
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm-linux-gnu --defsym=main=fn \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu --defsym=main=fn \
# RUN: -Bstatic --noinhibit-exec %t-o.o -o %t
# RUN: llvm-readobj -symbols %t | FileCheck %s
diff --git a/lld/test/elf/ARM/dynamic-symbols.test b/lld/test/elf/ARM/dynamic-symbols.test
index c468ca73781..13963be8e70 100644
--- a/lld/test/elf/ARM/dynamic-symbols.test
+++ b/lld/test/elf/ARM/dynamic-symbols.test
@@ -1,7 +1,7 @@
# Check that proper dynamic symbols are present in the generated executable
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: -Bstatic --noinhibit-exec %t-o.o -o %t
# RUN: llvm-readobj -symbols %t | FileCheck -check-prefix=STATIC %s
@@ -9,7 +9,7 @@
# STATIC-NOT: Name: _DYNAMIC
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-readobj -symbols %t | FileCheck -check-prefix=EXEC-DYN %s
@@ -29,7 +29,7 @@
# EXEC-DYN-NEXT: Section: Absolute (0xFFF1)
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: -shared --noinhibit-exec %t-o.o -o %t
# RUN: llvm-readobj -symbols %t | FileCheck -check-prefix=SHARED %s
diff --git a/lld/test/elf/ARM/entry-point.test b/lld/test/elf/ARM/entry-point.test
index 48aa65c2e66..4cfee4aa6c7 100644
--- a/lld/test/elf/ARM/entry-point.test
+++ b/lld/test/elf/ARM/entry-point.test
@@ -1,6 +1,6 @@
# 1. Check entry point address for ARM code - should be even.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-arm.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-arm.o -o %t-arm
# RUN: llvm-readobj -file-headers %t-arm | FileCheck -check-prefix=ARM-ENTRY %s
#
@@ -8,7 +8,7 @@
# 2. Check entry point address for Thumb code - should be odd.
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-thm.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-thm.o -o %t-thm
# RUN: llvm-readobj -file-headers %t-thm | FileCheck -check-prefix=THM-ENTRY %s
#
@@ -16,7 +16,7 @@
# 3. Check wrong entry point address align for ARM code.
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-arm-wrong.o
-# RUN: not lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: not lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-arm-wrong.o -o %t-arm-wrong 2> %t-error
# FileCheck -check-prefix=ARM-WRONG %s < %t-error
#
diff --git a/lld/test/elf/ARM/exidx.test b/lld/test/elf/ARM/exidx.test
index 6ea2aeec6ce..a277cfcd09a 100644
--- a/lld/test/elf/ARM/exidx.test
+++ b/lld/test/elf/ARM/exidx.test
@@ -1,6 +1,6 @@
# .ARM.exidx contents checking
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target arm-none-linux-eabi -static -o %t %t.o
+# RUN: lld -flavor old-gnu -target arm-none-linux-eabi -static -o %t %t.o
# RUN: llvm-objdump -s -t -section-headers %t | FileCheck %s
#
# CHECK: Sections:
diff --git a/lld/test/elf/ARM/header-flags.test b/lld/test/elf/ARM/header-flags.test
index 0723d3fdd1e..735d6522521 100644
--- a/lld/test/elf/ARM/header-flags.test
+++ b/lld/test/elf/ARM/header-flags.test
@@ -2,7 +2,7 @@
# 1. Check header flags for statically linked executable with default options.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t.o -o %t
# RUN: llvm-readobj -file-headers %t | FileCheck -check-prefix=STATIC-DEF %s
#
@@ -11,7 +11,7 @@
# 2. Check header flags for dynamically linked executable with default options.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi \
# RUN: --noinhibit-exec %t.o -o %t
# RUN: llvm-readobj -file-headers %t | FileCheck -check-prefix=EXEC-DYN-DEF %s
#
@@ -20,7 +20,7 @@
# 3. Check header flags for shared object with default options.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -shared \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -shared \
# RUN: --noinhibit-exec %t.o -o %t
# RUN: llvm-readobj -file-headers %t | FileCheck -check-prefix=SHARED-DEF %s
#
diff --git a/lld/test/elf/ARM/mapping-code-model.test b/lld/test/elf/ARM/mapping-code-model.test
index 2e85e2fd9c6..affa10b464f 100644
--- a/lld/test/elf/ARM/mapping-code-model.test
+++ b/lld/test/elf/ARM/mapping-code-model.test
@@ -3,7 +3,7 @@
# 1. ARM <=> Thumb generates both veneers.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-a-arm.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-t-thm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu --defsym=main=f_a \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu --defsym=main=f_a \
# RUN: -Bstatic --noinhibit-exec %t-a-arm.o %t-t-thm.o -o %t
# RUN: llvm-objdump -t %t | FileCheck -check-prefix=INTER %s
@@ -14,7 +14,7 @@
# 2. Thumb <=> Thumb doesn't generate veneers.
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-a-thm.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-t-thm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu --defsym=main=f_t \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu --defsym=main=f_t \
# RUN: -Bstatic --noinhibit-exec %t-t-thm.o %t-a-thm.o -o %t
# RUN: llvm-objdump -t %t | FileCheck -check-prefix=THUMB %s
diff --git a/lld/test/elf/ARM/mapping-symbols.test b/lld/test/elf/ARM/mapping-symbols.test
index 2c6347c6f16..c6a4b7afc50 100644
--- a/lld/test/elf/ARM/mapping-symbols.test
+++ b/lld/test/elf/ARM/mapping-symbols.test
@@ -1,7 +1,7 @@
# Check that mapping symbols have zero size, local binding and none type.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-a.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-t.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: -Bstatic --noinhibit-exec %t-a.o %t-t.o -o %t
# RUN: llvm-readobj -symbols %t | FileCheck %s
diff --git a/lld/test/elf/ARM/missing-symbol.test b/lld/test/elf/ARM/missing-symbol.test
index a4641c32837..a0d3dd51e57 100644
--- a/lld/test/elf/ARM/missing-symbol.test
+++ b/lld/test/elf/ARM/missing-symbol.test
@@ -1,7 +1,7 @@
# Check that _MISSING_SYMBOL_ symbol is not resolved
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t 2>&1 | FileCheck %s
# CHECK: Undefined symbol: {{.*}}: _MISSING_SYMBOL_
diff --git a/lld/test/elf/ARM/plt-dynamic.test b/lld/test/elf/ARM/plt-dynamic.test
index 5683ffbc1df..905f628edb4 100644
--- a/lld/test/elf/ARM/plt-dynamic.test
+++ b/lld/test/elf/ARM/plt-dynamic.test
@@ -2,7 +2,7 @@
#
# 1. ARM code generates PLT entries.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-arm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: --noinhibit-exec %t-arm.o -lfn -L%p/Inputs -o %t
# RUN: llvm-objdump -s %t | FileCheck -check-prefix=ARM %s
@@ -23,7 +23,7 @@
# 2. Thumb code generates PLT entries with veneers.
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-thm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: --noinhibit-exec %t-thm.o -lfn -L%p/Inputs -o %t
# RUN: llvm-objdump -s %t | FileCheck -check-prefix=THM %s
@@ -43,7 +43,7 @@
# 3. Thumb code generates PLT entries without veneers when bl->blx is done.
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-thm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: --noinhibit-exec %t-thm.o -lfn -L%p/Inputs -o %t
# RUN: llvm-objdump -s %t | FileCheck -check-prefix=THM-BLX %s
@@ -61,7 +61,7 @@
# Generation of mapping symbols.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-arm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: --noinhibit-exec %t-arm.o -lfn -L%p/Inputs -o %t-arm
# RUN: llvm-readobj -symbols %t-arm | FileCheck -check-prefix=ARM-MAPPING %s
@@ -70,7 +70,7 @@
# ARM-MAPPING: Name: {{[$]?[a]?[.]?}}__plt_fn
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-thm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: --noinhibit-exec %t-thm.o -lfn -L%p/Inputs -o %t-thm
# RUN: llvm-readobj -symbols %t-thm | FileCheck -check-prefix=THM-MAPPING %s
diff --git a/lld/test/elf/ARM/plt-ifunc-interwork.test b/lld/test/elf/ARM/plt-ifunc-interwork.test
index 2a823944c13..29d8282edf2 100644
--- a/lld/test/elf/ARM/plt-ifunc-interwork.test
+++ b/lld/test/elf/ARM/plt-ifunc-interwork.test
@@ -3,7 +3,7 @@
#
# 1. ARM code generates PLT without transition veneer.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-f1-arm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: -Bstatic --noinhibit-exec %t-f1-arm.o -o %t
# RUN: llvm-objdump -s %t | FileCheck -check-prefix=ARM-ONE %s
@@ -15,7 +15,7 @@
# 2. Thumb code generates PLT with transition veneer.
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-f1-thm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: -Bstatic --noinhibit-exec %t-f1-thm.o -o %t
# RUN: llvm-objdump -s %t | FileCheck -check-prefix=THM-ONE %s
@@ -28,21 +28,21 @@
# 3. ARM + Thumb code generate same single PLT with transition veneer.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-f1-arm.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-f1-thm-for-arm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: -Bstatic --noinhibit-exec %t-f1-arm.o %t-f1-thm-for-arm.o -o %t
# RUN: llvm-objdump -s %t | FileCheck -check-prefix=THM-ONE %s
# 4. Thumb + ARM code generate same single PLT with transition veneer.
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-f1-thm-for-arm.o
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-f1-arm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: -Bstatic --noinhibit-exec %t-f1-thm-for-arm.o %t-f1-arm.o -o %t
# RUN: llvm-objdump -s %t | FileCheck -check-prefix=THM-ONE %s
# 5. ARM + ARM code generate two PLTs without transition veneers.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-f1-arm.o
# RUN: yaml2obj -format=elf -docnum 4 %s > %t-f2-arm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: -Bstatic --noinhibit-exec %t-f1-arm.o %t-f2-arm.o -o %t
# RUN: llvm-objdump -s %t | FileCheck -check-prefix=ARM-TWO %s
@@ -57,7 +57,7 @@
# 6. ARM + Thumb code generate two PLTs without and with transition veneer.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-f1-arm.o
# RUN: yaml2obj -format=elf -docnum 5 %s > %t-f2-thm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: -Bstatic --noinhibit-exec %t-f1-arm.o %t-f2-thm.o -o %t
# RUN: llvm-objdump -s %t | FileCheck -check-prefix=ARM-THM-TWO %s
@@ -72,7 +72,7 @@
# 7. Thumb + ARM code generate two PLTs with and without transition veneer.
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-f1-thm.o
# RUN: yaml2obj -format=elf -docnum 4 %s > %t-f2-arm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: -Bstatic --noinhibit-exec %t-f1-thm.o %t-f2-arm.o -o %t
# RUN: llvm-objdump -s %t | FileCheck -check-prefix=THM-ARM-TWO %s
@@ -87,7 +87,7 @@
# 8. Thumb + Thumb code generate two PLTs with transition veneers.
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-f1-thm.o
# RUN: yaml2obj -format=elf -docnum 5 %s > %t-f2-thm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: -Bstatic --noinhibit-exec %t-f1-thm.o %t-f2-thm.o -o %t
# RUN: llvm-objdump -s %t | FileCheck -check-prefix=THM-TWO %s
@@ -101,7 +101,7 @@
# 9. Thumb code generates PLT without transition veneer when bl->blx is done.
# RUN: yaml2obj -format=elf -docnum 6 %s > %t-f1-thm-c.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: -Bstatic --noinhibit-exec %t-f1-thm-c.o -o %t
# RUN: llvm-objdump -s %t | FileCheck -check-prefix=THM-BL %s
diff --git a/lld/test/elf/ARM/plt-ifunc-mapping.test b/lld/test/elf/ARM/plt-ifunc-mapping.test
index 422f22d3597..8c6d23aec08 100644
--- a/lld/test/elf/ARM/plt-ifunc-mapping.test
+++ b/lld/test/elf/ARM/plt-ifunc-mapping.test
@@ -2,7 +2,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-arm.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-thm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: -Bstatic --noinhibit-exec %t-arm.o %t-thm.o -o %t
# RUN: llvm-readobj -symbols %t | FileCheck %s
diff --git a/lld/test/elf/ARM/rel-abs32.test b/lld/test/elf/ARM/rel-abs32.test
index 399c516723e..7dcf632f53d 100644
--- a/lld/test/elf/ARM/rel-abs32.test
+++ b/lld/test/elf/ARM/rel-abs32.test
@@ -1,6 +1,6 @@
# Check handling of R_ARM_ABS32 relocation.
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
diff --git a/lld/test/elf/ARM/rel-arm-call.test b/lld/test/elf/ARM/rel-arm-call.test
index 04b17a21f74..64b78920428 100644
--- a/lld/test/elf/ARM/rel-arm-call.test
+++ b/lld/test/elf/ARM/rel-arm-call.test
@@ -1,6 +1,6 @@
# Check handling of R_ARM_CALL relocation.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
@@ -14,7 +14,7 @@
# CHECK: 00400088 g F .text {{[0-9a-f]+}} main
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: not lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: not lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t 2> %t-error
# RUN: FileCheck -check-prefix=OVERFLOW %s < %t-error
diff --git a/lld/test/elf/ARM/rel-arm-jump24-veneer-b.test b/lld/test/elf/ARM/rel-arm-jump24-veneer-b.test
index 4805ec065e0..76e9523dbbe 100644
--- a/lld/test/elf/ARM/rel-arm-jump24-veneer-b.test
+++ b/lld/test/elf/ARM/rel-arm-jump24-veneer-b.test
@@ -2,7 +2,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-arm.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-thm.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-arm.o %t-thm.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck -check-prefix=STATIC %s
@@ -27,7 +27,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-arm.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-thm.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi \
# RUN: --noinhibit-exec %t-arm.o %t-thm.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck -check-prefix=EXEC-DYN %s
diff --git a/lld/test/elf/ARM/rel-arm-jump24-veneer-bl.test b/lld/test/elf/ARM/rel-arm-jump24-veneer-bl.test
index d3818323f77..300355fbb11 100644
--- a/lld/test/elf/ARM/rel-arm-jump24-veneer-bl.test
+++ b/lld/test/elf/ARM/rel-arm-jump24-veneer-bl.test
@@ -2,7 +2,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-arm.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-thm.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-arm.o %t-thm.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck -check-prefix=STATIC %s
@@ -26,7 +26,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-arm.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-thm.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi \
# RUN: --noinhibit-exec %t-arm.o %t-thm.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck -check-prefix=EXEC-DYN %s
diff --git a/lld/test/elf/ARM/rel-arm-jump24.test b/lld/test/elf/ARM/rel-arm-jump24.test
index 8321d256c0c..c0d8ccc8d38 100644
--- a/lld/test/elf/ARM/rel-arm-jump24.test
+++ b/lld/test/elf/ARM/rel-arm-jump24.test
@@ -1,6 +1,6 @@
# Check handling of R_ARM_JUMP24 relocation.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
@@ -14,7 +14,7 @@
# CHECK: 00400090 g F .text {{[0-9a-f]+}} main
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: not lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: not lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t 2> %t-error
# RUN: FileCheck -check-prefix=OVERFLOW %s < %t-error
diff --git a/lld/test/elf/ARM/rel-arm-mov.test b/lld/test/elf/ARM/rel-arm-mov.test
index a436915c503..b492cc25906 100644
--- a/lld/test/elf/ARM/rel-arm-mov.test
+++ b/lld/test/elf/ARM/rel-arm-mov.test
@@ -1,6 +1,6 @@
# Check handling of R_ARM_MOVW_ABS_NC and R_ARM_MOVT_ABS relocation pair.
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
diff --git a/lld/test/elf/ARM/rel-arm-prel31.test b/lld/test/elf/ARM/rel-arm-prel31.test
index ca6dcdbd699..b07d5dd9fd7 100644
--- a/lld/test/elf/ARM/rel-arm-prel31.test
+++ b/lld/test/elf/ARM/rel-arm-prel31.test
@@ -1,6 +1,6 @@
# Check handling of R_ARM_PREL31 relocation.
# RUN: yaml2obj -format=elf -docnum=1 %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec --defsym=main=__gxx_personality_v0 %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
@@ -10,7 +10,7 @@
# CHECK: 00400054 g F .text {{[0-9a-f]+}} __gxx_personality_v0
# RUN: yaml2obj -format=elf -docnum=2 %s > %t-o.o
-# RUN: not lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: not lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec --defsym=main=__gxx_personality_v0 %t-o.o -o %t 2> %t-error
# RUN: FileCheck -check-prefix=OVERFLOW %s < %t-error
diff --git a/lld/test/elf/ARM/rel-arm-target1.test b/lld/test/elf/ARM/rel-arm-target1.test
index 92a82d1b237..064c6866187 100644
--- a/lld/test/elf/ARM/rel-arm-target1.test
+++ b/lld/test/elf/ARM/rel-arm-target1.test
@@ -2,7 +2,7 @@
#
# 1. R_ARM_TARGET1 is equal to R_ARM_ABS32
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-abs32.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec --target1-abs %t-abs32.o -o %t-abs32
# RUN: llvm-objdump -s -t %t-abs32 | FileCheck -check-prefix=CHECK-ABS32 %s
#
@@ -15,7 +15,7 @@
# 2. R_ARM_TARGET1 is equal to R_ARM_REL32
# Check handling of R_ARM_REL32 relocation.
# RUN: yaml2obj -format=elf %s -docnum 2 > %t-rel32.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec --target1-rel %t-rel32.o -o %t-rel32
# RUN: llvm-objdump -s -t %t-rel32 | FileCheck -check-prefix=CHECK-REL32 %s
#
diff --git a/lld/test/elf/ARM/rel-arm-thm-interwork.test b/lld/test/elf/ARM/rel-arm-thm-interwork.test
index 2e667d29cd0..3e0e30a614e 100644
--- a/lld/test/elf/ARM/rel-arm-thm-interwork.test
+++ b/lld/test/elf/ARM/rel-arm-thm-interwork.test
@@ -1,7 +1,7 @@
# Check ARM <=> Thumb interwork.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-arm.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-thm.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-arm.o %t-thm.o -o %t
# Check R_ARM_CALL veneer to call Thumb code
diff --git a/lld/test/elf/ARM/rel-base-prel.test b/lld/test/elf/ARM/rel-base-prel.test
index 7000176d1ac..054ce58ff7b 100644
--- a/lld/test/elf/ARM/rel-base-prel.test
+++ b/lld/test/elf/ARM/rel-base-prel.test
@@ -3,7 +3,7 @@
# for other cases.
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
diff --git a/lld/test/elf/ARM/rel-copy.test b/lld/test/elf/ARM/rel-copy.test
index ff92e455c05..f181f72a219 100644
--- a/lld/test/elf/ARM/rel-copy.test
+++ b/lld/test/elf/ARM/rel-copy.test
@@ -1,6 +1,6 @@
# Check handling of R_ARM_COPY relocation.
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi \
# RUN: --noinhibit-exec %t-o.o -lobj -L%p/Inputs -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
# RUN: llvm-readobj -relocations %t | FileCheck -check-prefix=READOBJ %s
diff --git a/lld/test/elf/ARM/rel-glob-dat.test b/lld/test/elf/ARM/rel-glob-dat.test
index e067341c32f..34f50c5b0e3 100644
--- a/lld/test/elf/ARM/rel-glob-dat.test
+++ b/lld/test/elf/ARM/rel-glob-dat.test
@@ -1,7 +1,7 @@
# Check handling of R_ARM_GLOB_DAT relocation.
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -shared \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -shared \
# RUN: --noinhibit-exec %t-o.o -lfn -L%p/Inputs -o %t
# RUN: llvm-readobj -relocations %t | FileCheck %s
diff --git a/lld/test/elf/ARM/rel-got-brel.test b/lld/test/elf/ARM/rel-got-brel.test
index 52e1e21ee74..c8786d81127 100644
--- a/lld/test/elf/ARM/rel-got-brel.test
+++ b/lld/test/elf/ARM/rel-got-brel.test
@@ -1,7 +1,7 @@
# Check handling of R_ARM_GOT_BREL relocation.
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
diff --git a/lld/test/elf/ARM/rel-group-relocs.test b/lld/test/elf/ARM/rel-group-relocs.test
index c54d7412ab3..16e82b3e427 100644
--- a/lld/test/elf/ARM/rel-group-relocs.test
+++ b/lld/test/elf/ARM/rel-group-relocs.test
@@ -2,7 +2,7 @@
# R_ARM_LDR_PC_G2).
#
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: -e plt_func %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
diff --git a/lld/test/elf/ARM/rel-ifunc.test b/lld/test/elf/ARM/rel-ifunc.test
index 19461906c53..7044534af1e 100644
--- a/lld/test/elf/ARM/rel-ifunc.test
+++ b/lld/test/elf/ARM/rel-ifunc.test
@@ -1,6 +1,6 @@
# Check handling of IFUNC (gnu_indirect_function).
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
diff --git a/lld/test/elf/ARM/rel-jump-slot.test b/lld/test/elf/ARM/rel-jump-slot.test
index bc9d31423d8..2a4f4eba8d8 100644
--- a/lld/test/elf/ARM/rel-jump-slot.test
+++ b/lld/test/elf/ARM/rel-jump-slot.test
@@ -1,7 +1,7 @@
# Check handling of R_ARM_JUMP_SLOT relocation.
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -shared \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -shared \
# RUN: --noinhibit-exec %t-o.o -lfn -L%p/Inputs -o %t
# RUN: llvm-readobj -relocations %t | FileCheck %s
diff --git a/lld/test/elf/ARM/rel-rel32.test b/lld/test/elf/ARM/rel-rel32.test
index 4de108484fd..9e5aab00052 100644
--- a/lld/test/elf/ARM/rel-rel32.test
+++ b/lld/test/elf/ARM/rel-rel32.test
@@ -1,6 +1,6 @@
# Check handling of R_ARM_REL32 relocation.
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
diff --git a/lld/test/elf/ARM/rel-thm-call.test b/lld/test/elf/ARM/rel-thm-call.test
index 35ea5d98508..7e7289a9976 100644
--- a/lld/test/elf/ARM/rel-thm-call.test
+++ b/lld/test/elf/ARM/rel-thm-call.test
@@ -1,6 +1,6 @@
# Check handling of R_ARM_THM_CALL relocation.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
@@ -14,7 +14,7 @@
# CHECK: 00400080 g F .text {{[0-9a-f]+}} main
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: not lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: not lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t 2> %t-error
# RUN: FileCheck -check-prefix=OVERFLOW %s < %t-error
diff --git a/lld/test/elf/ARM/rel-thm-jump11.test b/lld/test/elf/ARM/rel-thm-jump11.test
index ba53ac8b856..e074b9ae1ab 100644
--- a/lld/test/elf/ARM/rel-thm-jump11.test
+++ b/lld/test/elf/ARM/rel-thm-jump11.test
@@ -1,6 +1,6 @@
# Check handling of R_ARM_THM_JUMP11 relocation.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
@@ -11,7 +11,7 @@
# CHECK: 004001a4 g F .text 00000004 __gnu_h2f_alternative
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: not lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: not lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t 2> %t-error
# RUN: FileCheck -check-prefix=OVERFLOW %s < %t-error
diff --git a/lld/test/elf/ARM/rel-thm-jump24-veneer.test b/lld/test/elf/ARM/rel-thm-jump24-veneer.test
index b6954c196fb..5893b53da84 100644
--- a/lld/test/elf/ARM/rel-thm-jump24-veneer.test
+++ b/lld/test/elf/ARM/rel-thm-jump24-veneer.test
@@ -2,7 +2,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-arm.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-thm.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-arm.o %t-thm.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck -check-prefix=STATIC %s
@@ -26,7 +26,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-arm.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-thm.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi \
# RUN: --noinhibit-exec %t-arm.o %t-thm.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck -check-prefix=EXEC-DYN %s
diff --git a/lld/test/elf/ARM/rel-thm-jump24.test b/lld/test/elf/ARM/rel-thm-jump24.test
index faa12d3d598..b58bc053aca 100644
--- a/lld/test/elf/ARM/rel-thm-jump24.test
+++ b/lld/test/elf/ARM/rel-thm-jump24.test
@@ -1,6 +1,6 @@
# Check handling of R_ARM_THM_JUMP24 relocation.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
@@ -14,7 +14,7 @@
# CHECK: 00400084 g F .text {{[0-9a-f]+}} main
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: not lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: not lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t 2> %t-error
# RUN: FileCheck -check-prefix=OVERFLOW %s < %t-error
diff --git a/lld/test/elf/ARM/rel-thm-mov.test b/lld/test/elf/ARM/rel-thm-mov.test
index 77aa3a2b730..5e2e134ce78 100644
--- a/lld/test/elf/ARM/rel-thm-mov.test
+++ b/lld/test/elf/ARM/rel-thm-mov.test
@@ -1,7 +1,7 @@
# 1. Check handling of R_ARM_THM_MOVW_ABS_NC and R_THM_ARM_MOVT_ABS relocation pair.
# 2. Check that instructions are not cropped for symbols that address Thumb code.
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
# RUN: llvm-objdump -s -t %t | FileCheck -check-prefix=INSN-CROP %s
diff --git a/lld/test/elf/ARM/rel-tls-ie32.test b/lld/test/elf/ARM/rel-tls-ie32.test
index bb92539a8d3..e05b262cd1b 100644
--- a/lld/test/elf/ARM/rel-tls-ie32.test
+++ b/lld/test/elf/ARM/rel-tls-ie32.test
@@ -2,7 +2,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-tls.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-tlsv.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-tls.o %t-tlsv.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck -check-prefix=STATIC %s
@@ -19,7 +19,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-tls.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-tlsv.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi \
# RUN: --noinhibit-exec %t-tls.o %t-tlsv.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck -check-prefix=EXEC-DYN %s
diff --git a/lld/test/elf/ARM/rel-tls-le32.test b/lld/test/elf/ARM/rel-tls-le32.test
index 1656977245d..eba4f950515 100644
--- a/lld/test/elf/ARM/rel-tls-le32.test
+++ b/lld/test/elf/ARM/rel-tls-le32.test
@@ -1,7 +1,7 @@
# Check handling of R_ARM_TLS_LE32 relocation.
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck -check-prefix=STATIC %s
@@ -13,7 +13,7 @@
# STATIC: 00000000 g .tdata 00000004 i
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck -check-prefix=EXEC-DYN %s
diff --git a/lld/test/elf/ARM/rel-v4bx.test b/lld/test/elf/ARM/rel-v4bx.test
index 77493419a12..d2d3a7772b4 100644
--- a/lld/test/elf/ARM/rel-v4bx.test
+++ b/lld/test/elf/ARM/rel-v4bx.test
@@ -2,7 +2,7 @@
# Check handling of R_ARM_V4BX relocation.
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -d -triple=armv4t %t | FileCheck %s
diff --git a/lld/test/elf/ARM/thm-symbols.test b/lld/test/elf/ARM/thm-symbols.test
index c85dc6a318c..6377d1e3ef8 100644
--- a/lld/test/elf/ARM/thm-symbols.test
+++ b/lld/test/elf/ARM/thm-symbols.test
@@ -4,7 +4,7 @@
# 3. Symbol content.
# RUN: yaml2obj -format=elf %s > %t-t.o
-# RUN: lld -flavor gnu -target arm-linux-gnu \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu \
# RUN: -Bstatic --noinhibit-exec %t-t.o -o %t-t
# RUN: llvm-readobj -symbols %t-t | FileCheck -check-prefix=SYM-ADDR %s
# RUN: llvm-readobj -symbols %t-t | FileCheck -check-prefix=SYM-SIZE %s
diff --git a/lld/test/elf/ARM/two-got-for-symbol.test b/lld/test/elf/ARM/two-got-for-symbol.test
index 6756e0b7850..e0420eff191 100644
--- a/lld/test/elf/ARM/two-got-for-symbol.test
+++ b/lld/test/elf/ARM/two-got-for-symbol.test
@@ -2,7 +2,7 @@
# R_ARM_GLOB_DAT may be present for the same symbol in the linked binary.
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -shared \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -shared \
# RUN: --noinhibit-exec %t-o.o -lfn -L%p/Inputs -o %t
# RUN: llvm-readobj -relocations %t | FileCheck %s
diff --git a/lld/test/elf/ARM/undef-lazy-symbol.test b/lld/test/elf/ARM/undef-lazy-symbol.test
index 194ea7acb4b..361c6482dab 100644
--- a/lld/test/elf/ARM/undef-lazy-symbol.test
+++ b/lld/test/elf/ARM/undef-lazy-symbol.test
@@ -1,7 +1,7 @@
# Check that _GLOBAL_OFFSET_TABLE_ symbol is resolved
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-got.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-got.o -o %t
# RUN: llvm-readobj -symbols %t | FileCheck -check-prefix=GOT %s
@@ -16,7 +16,7 @@
# Check that __exidx_start/_end symbols are resolved
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-exidx.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --defsym=main=fn --noinhibit-exec %t-exidx.o -o %t
# RUN: llvm-readobj -symbols %t | FileCheck -check-prefix=EXIDX %s
@@ -40,7 +40,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-got.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-exidx.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-got.o %t-exidx.o -o %t
# RUN: llvm-readobj -symbols %t | FileCheck -check-prefix=SYMS %s
diff --git a/lld/test/elf/ARM/veneer-mapping.test b/lld/test/elf/ARM/veneer-mapping.test
index 81e90ddfc36..ccd93eea4fb 100644
--- a/lld/test/elf/ARM/veneer-mapping.test
+++ b/lld/test/elf/ARM/veneer-mapping.test
@@ -2,7 +2,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-arm.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-thm.o
-# RUN: lld -flavor gnu -target arm-linux-gnu --defsym=main=fa \
+# RUN: lld -flavor old-gnu -target arm-linux-gnu --defsym=main=fa \
# RUN: -Bstatic --noinhibit-exec %t-arm.o %t-thm.o -o %t
# RUN: llvm-readobj -symbols %t | FileCheck %s
diff --git a/lld/test/elf/ARM/weak-branch.test b/lld/test/elf/ARM/weak-branch.test
index 0349f502310..76c7a4d15b6 100644
--- a/lld/test/elf/ARM/weak-branch.test
+++ b/lld/test/elf/ARM/weak-branch.test
@@ -1,7 +1,7 @@
# Check weak references fixup.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-jmp11.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-jmp11.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck -check-prefix=JMP11-CHECK %s
@@ -18,7 +18,7 @@
# JMP11-CHECK: 00000000 w *UND* 00000000 __gnu_h2f_internal
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-thm-call.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-thm-call.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck -check-prefix=THM-CALL-CHECK %s
@@ -33,7 +33,7 @@
# THM-CALL-CHECK: 00000000 w *UND* 00000000 weak_fn
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-arm-call.o
-# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: lld -flavor old-gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-arm-call.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck -check-prefix=ARM-CALL-CHECK %s
diff --git a/lld/test/elf/Hexagon/dynlib-data.test b/lld/test/elf/Hexagon/dynlib-data.test
index f3260ba4847..2da312b54d4 100644
--- a/lld/test/elf/Hexagon/dynlib-data.test
+++ b/lld/test/elf/Hexagon/dynlib-data.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target hexagon %p/Inputs/dynobj-data.o \
+RUN: lld -flavor old-gnu -target hexagon %p/Inputs/dynobj-data.o \
RUN: -o %t --noinhibit-exec -shared
RUN: llvm-objdump -s %t > %t1
RUN: FileCheck -check-prefix=CHECKRELOCS %s < %t1
diff --git a/lld/test/elf/Hexagon/dynlib-gotoff.test b/lld/test/elf/Hexagon/dynlib-gotoff.test
index 90475308681..f31d23bc5eb 100644
--- a/lld/test/elf/Hexagon/dynlib-gotoff.test
+++ b/lld/test/elf/Hexagon/dynlib-gotoff.test
@@ -1,5 +1,5 @@
# This tests GOT's and PLT's for dynamic libraries for Hexagon
-RUN: lld -flavor gnu -target hexagon %p/Inputs/dynobj.o \
+RUN: lld -flavor old-gnu -target hexagon %p/Inputs/dynobj.o \
RUN: -o %t --output-filetype=yaml -shared --noinhibit-exec
RUN: FileCheck -check-prefix=CHECKGOTPLT %s < %t
diff --git a/lld/test/elf/Hexagon/dynlib-hash.test b/lld/test/elf/Hexagon/dynlib-hash.test
index f9317649234..e2636812097 100644
--- a/lld/test/elf/Hexagon/dynlib-hash.test
+++ b/lld/test/elf/Hexagon/dynlib-hash.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target hexagon %p/Inputs/dynobj.o \
+RUN: lld -flavor old-gnu -target hexagon %p/Inputs/dynobj.o \
RUN: -o %t --noinhibit-exec -shared
RUN: llvm-objdump -s %t > %t1
RUN: FileCheck -check-prefix=CHECKHASH %s < %t1
diff --git a/lld/test/elf/Hexagon/dynlib-rela.test b/lld/test/elf/Hexagon/dynlib-rela.test
index 81617349e2f..86e38ede628 100644
--- a/lld/test/elf/Hexagon/dynlib-rela.test
+++ b/lld/test/elf/Hexagon/dynlib-rela.test
@@ -1,5 +1,5 @@
# Tests that the relocation sections have the right alignment.
-RUN: lld -flavor gnu -target hexagon %p/Inputs/use-shared.hexagon -shared -o %t1
+RUN: lld -flavor old-gnu -target hexagon %p/Inputs/use-shared.hexagon -shared -o %t1
RUN: llvm-readobj -sections %t1 > %t2
RUN: FileCheck -check-prefix=SECTIONS %s < %t2
diff --git a/lld/test/elf/Hexagon/dynlib-syms.test b/lld/test/elf/Hexagon/dynlib-syms.test
index e649230d9e9..08f8930bb20 100644
--- a/lld/test/elf/Hexagon/dynlib-syms.test
+++ b/lld/test/elf/Hexagon/dynlib-syms.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target hexagon %p/Inputs/dynobj.o \
+RUN: lld -flavor old-gnu -target hexagon %p/Inputs/dynobj.o \
RUN: -o %t --noinhibit-exec -shared
RUN: llvm-nm -n -M %t > %t1
RUN: FileCheck -check-prefix=CHECKSYMS %s < %t1
diff --git a/lld/test/elf/Hexagon/dynlib.test b/lld/test/elf/Hexagon/dynlib.test
index c5bf23fdf22..9e591ed0607 100644
--- a/lld/test/elf/Hexagon/dynlib.test
+++ b/lld/test/elf/Hexagon/dynlib.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target hexagon %p/Inputs/use-shared.hexagon -shared -o %t1
+RUN: lld -flavor old-gnu -target hexagon %p/Inputs/use-shared.hexagon -shared -o %t1
RUN: llvm-readobj -dyn-symbols %t1 > %t2
RUN: FileCheck -check-prefix=DYNSYMS %s < %t2
RUN: llvm-readobj -program-headers %t1 | FileCheck %s
diff --git a/lld/test/elf/Hexagon/hexagon-got-plt-order.test b/lld/test/elf/Hexagon/hexagon-got-plt-order.test
index 7600ebe59fc..e2d37d1f644 100644
--- a/lld/test/elf/Hexagon/hexagon-got-plt-order.test
+++ b/lld/test/elf/Hexagon/hexagon-got-plt-order.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target hexagon %p/Inputs/got-plt-order.o -o %t -shared
+RUN: lld -flavor old-gnu -target hexagon %p/Inputs/got-plt-order.o -o %t -shared
RUN: llvm-objdump -section-headers %t | FileCheck %s
CHECK: .got
diff --git a/lld/test/elf/Hexagon/hexagon-plt-setup.test b/lld/test/elf/Hexagon/hexagon-plt-setup.test
index 15c4e22ed9c..51d8bd6a6b7 100644
--- a/lld/test/elf/Hexagon/hexagon-plt-setup.test
+++ b/lld/test/elf/Hexagon/hexagon-plt-setup.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target hexagon %p/Inputs/use-shared.hexagon \
+RUN: lld -flavor old-gnu -target hexagon %p/Inputs/use-shared.hexagon \
RUN: --output-filetype=yaml --noinhibit-exec -o %t2
RUN: FileCheck %s < %t2
diff --git a/lld/test/elf/Hexagon/maxalignment.test b/lld/test/elf/Hexagon/maxalignment.test
index cac1c200734..15a2bf3d80b 100644
--- a/lld/test/elf/Hexagon/maxalignment.test
+++ b/lld/test/elf/Hexagon/maxalignment.test
@@ -1,7 +1,7 @@
# This tests that we lld is able to get the contentType properly for archives
# when they intermittently get loaded at an address whose alignment is 2
-RUN: lld -flavor gnu -target hexagon --whole-archive %p/Inputs/libMaxAlignment.a \
+RUN: lld -flavor old-gnu -target hexagon --whole-archive %p/Inputs/libMaxAlignment.a \
RUN: --noinhibit-exec -static -o %t
RUN: llvm-nm %t | FileCheck %s
diff --git a/lld/test/elf/Hexagon/rela-order.test b/lld/test/elf/Hexagon/rela-order.test
index 925a82c2929..777b923fd73 100644
--- a/lld/test/elf/Hexagon/rela-order.test
+++ b/lld/test/elf/Hexagon/rela-order.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target hexagon %p/Inputs/dynobj.o -shared \
+RUN: lld -flavor old-gnu -target hexagon %p/Inputs/dynobj.o -shared \
RUN: --noinhibit-exec -o %t
RUN: llvm-objdump -section-headers %t | FileCheck %s
diff --git a/lld/test/elf/Hexagon/sda-base.test b/lld/test/elf/Hexagon/sda-base.test
index 0bab92abf68..cfcafbce837 100644
--- a/lld/test/elf/Hexagon/sda-base.test
+++ b/lld/test/elf/Hexagon/sda-base.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target hexagon %p/Inputs/sda-base.o -o %t1 --noinhibit-exec
+RUN: lld -flavor old-gnu -target hexagon %p/Inputs/sda-base.o -o %t1 --noinhibit-exec
RUN: llvm-nm -n %t1 | FileCheck %s -check-prefix=sdabase
sdabase: 00002000 A _SDA_BASE_
diff --git a/lld/test/elf/Hexagon/zerofillquick-sdata.test b/lld/test/elf/Hexagon/zerofillquick-sdata.test
index 5488e19f5c4..1b932fe6e7b 100644
--- a/lld/test/elf/Hexagon/zerofillquick-sdata.test
+++ b/lld/test/elf/Hexagon/zerofillquick-sdata.test
@@ -1,7 +1,7 @@
# This tests that a typeZeroFillFast atom is associated with a section that has
# the correct memory size.
-RUN: lld -flavor gnu -target hexagon %p/Inputs/sdata1.o %p/Inputs/sdata2.o \
+RUN: lld -flavor old-gnu -target hexagon %p/Inputs/sdata1.o %p/Inputs/sdata2.o \
RUN: -o %t --noinhibit-exec -static
RUN: llvm-readobj -sections %t | FileCheck -check-prefix=CHECKSECTIONSANDSIZE %s
diff --git a/lld/test/elf/Mips/abi-flags-01.test b/lld/test/elf/Mips/abi-flags-01.test
index 74d13e6b53d..d2eb13f3186 100644
--- a/lld/test/elf/Mips/abi-flags-01.test
+++ b/lld/test/elf/Mips/abi-flags-01.test
@@ -1,7 +1,7 @@
# Check rejecting .MIPS.abiflags section with a wrong version.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -shared -o %t.so %t.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o 2>&1 \
# RUN: | FileCheck %s
# CHECK: {{.*}}abi-flags-01.test.tmp.o: .MIPS.abiflags section has unsupported version '1'
diff --git a/lld/test/elf/Mips/abi-flags-02.test b/lld/test/elf/Mips/abi-flags-02.test
index 33c50263592..f3c1f29abc5 100644
--- a/lld/test/elf/Mips/abi-flags-02.test
+++ b/lld/test/elf/Mips/abi-flags-02.test
@@ -6,7 +6,7 @@
# settings as the input section.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o
# RUN: llvm-readobj -s -program-headers -mips-abi-flags %t.so | FileCheck %s
# CHECK: Section {
diff --git a/lld/test/elf/Mips/abi-flags-03.test b/lld/test/elf/Mips/abi-flags-03.test
index 2150d364b06..a28bb282673 100644
--- a/lld/test/elf/Mips/abi-flags-03.test
+++ b/lld/test/elf/Mips/abi-flags-03.test
@@ -9,7 +9,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t1.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t3.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t1.o %t2.o %t3.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t1.o %t2.o %t3.o
# RUN: llvm-readobj -mips-abi-flags %t.so | FileCheck %s
# CHECK: MIPS ABI Flags {
diff --git a/lld/test/elf/Mips/abi-flags-04.test b/lld/test/elf/Mips/abi-flags-04.test
index f344faefb34..6cde797dd3a 100644
--- a/lld/test/elf/Mips/abi-flags-04.test
+++ b/lld/test/elf/Mips/abi-flags-04.test
@@ -11,7 +11,7 @@
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-64.o
# RUN: yaml2obj -format=elf -docnum 4 %s > %t-64a.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t1 %t-xx.o %t-double.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t1 %t-xx.o %t-double.o
# RUN: llvm-readobj -mips-abi-flags %t1 | FileCheck -check-prefix=XX-DOUBLE %s
# XX-DOUBLE: FP ABI: Hard float (double precision) (0x1)
@@ -19,7 +19,7 @@
# XX-DOUBLE: CPR1 size: 32
# XX-DOUBLE: Flags 1 [ (0x0)
-# RUN: lld -flavor gnu -target mipsel -shared -o %t2 %t-xx.o %t-64.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t2 %t-xx.o %t-64.o
# RUN: llvm-readobj -mips-abi-flags %t2 | FileCheck -check-prefix=XX-64 %s
# XX-64: FP ABI: Hard float (32-bit CPU, 64-bit FPU) (0x6)
@@ -28,7 +28,7 @@
# XX-64: Flags 1 [ (0x1)
# XX-64: ODDSPREG (0x1)
-# RUN: lld -flavor gnu -target mipsel -shared -o %t3 %t-xx.o %t-64a.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t3 %t-xx.o %t-64a.o
# RUN: llvm-readobj -mips-abi-flags %t3 | FileCheck -check-prefix=XX-64A %s
# XX-64A: FP ABI: Hard float compat (32-bit CPU, 64-bit FPU) (0x7)
@@ -36,7 +36,7 @@
# XX-64A: CPR1 size: 64
# XX-64A: Flags 1 [ (0x0)
-# RUN: lld -flavor gnu -target mipsel -shared -o %t4 %t-64.o %t-64a.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t4 %t-64.o %t-64a.o
# RUN: llvm-readobj -mips-abi-flags %t4 | FileCheck -check-prefix=64-64A %s
# 64-64A: FP ABI: Hard float (32-bit CPU, 64-bit FPU) (0x6)
diff --git a/lld/test/elf/Mips/abi-flags-05.test b/lld/test/elf/Mips/abi-flags-05.test
index 515cbcfc3d4..6a009db7344 100644
--- a/lld/test/elf/Mips/abi-flags-05.test
+++ b/lld/test/elf/Mips/abi-flags-05.test
@@ -13,57 +13,57 @@
# RUN: yaml2obj -format=elf -docnum 5 %s > %t-64.o
# RUN: yaml2obj -format=elf -docnum 6 %s > %t-64a.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t1 %t-xx.o %t-sgl.o 2>&1 \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t1 %t-xx.o %t-sgl.o 2>&1 \
# RUN: | FileCheck -check-prefix=XX-SINGLE-WARN %s
# XX-SINGLE-WARN: FP ABI {{-mfpxx|-msingle-float}} is incompatible with {{-msingle-float|-mfpxx}}
-# RUN: lld -flavor gnu -target mipsel -shared -o %t2 %t-xx.o %t-soft.o 2>&1 \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t2 %t-xx.o %t-soft.o 2>&1 \
# RUN: | FileCheck -check-prefix=XX-SOFT-WARN %s
# XX-SOFT-WARN: FP ABI {{-mfpxx|-msoft-float}} is incompatible with {{-msoft-float|-mfpxx}}
-# RUN: lld -flavor gnu -target mipsel -shared -o %t3 %t-dbl.o %t-sgl.o 2>&1 \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t3 %t-dbl.o %t-sgl.o 2>&1 \
# RUN: | FileCheck -check-prefix=DOUBLE-SINGLE-WARN %s
# DOUBLE-SINGLE-WARN: FP ABI {{-mdouble-float|-msingle-float}} is incompatible with {{-msingle-float|-mdouble-float}}
-# RUN: lld -flavor gnu -target mipsel -shared -o %t4 %t-dbl.o %t-soft.o 2>&1 \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t4 %t-dbl.o %t-soft.o 2>&1 \
# RUN: | FileCheck -check-prefix=DOUBLE-SOFT-WARN %s
# DOUBLE-SOFT-WARN: FP ABI {{-mdouble-float|-msoft-float}} is incompatible with {{-msoft-float|-mdouble-float}}
-# RUN: lld -flavor gnu -target mipsel -shared -o %t5 %t-dbl.o %t-64.o 2>&1 \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t5 %t-dbl.o %t-64.o 2>&1 \
# RUN: | FileCheck -check-prefix=DOUBLE-64-WARN %s
# DOUBLE-64-WARN: FP ABI {{-mdouble-float|-mgp32 -mfp64}} is incompatible with {{-mgp32 -mfp64|-mdouble-float}}
-# RUN: lld -flavor gnu -target mipsel -shared -o %t6 %t-dbl.o %t-64a.o 2>&1 \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t6 %t-dbl.o %t-64a.o 2>&1 \
# RUN: | FileCheck -check-prefix=DOUBLE-64A-WARN %s
# DOUBLE-64A-WARN: FP ABI {{-mdouble-float|-mgp32 -mfp64 -mno-odd-spreg}} is incompatible with {{-mgp32 -mfp64 -mno-odd-spreg|-mdouble-float}}
-# RUN: lld -flavor gnu -target mipsel -shared -o %t7 %t-sgl.o %t-soft.o 2>&1 \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t7 %t-sgl.o %t-soft.o 2>&1 \
# RUN: | FileCheck -check-prefix=SINGLE-SOFT-WARN %s
# SINGLE-SOFT-WARN: FP ABI {{-msingle-float|-msoft-float}} is incompatible with {{-msoft-float|-msingle-float}}
-# RUN: lld -flavor gnu -target mipsel -shared -o %t8 %t-sgl.o %t-64.o 2>&1 \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t8 %t-sgl.o %t-64.o 2>&1 \
# RUN: | FileCheck -check-prefix=SINGLE-64-WARN %s
# SINGLE-64-WARN: FP ABI {{-msingle-float|-mgp32 -mfp64}} is incompatible with {{-mgp32 -mfp64|-msingle-float}}
-# RUN: lld -flavor gnu -target mipsel -shared -o %t9 %t-sgl.o %t-64a.o 2>&1 \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t9 %t-sgl.o %t-64a.o 2>&1 \
# RUN: | FileCheck -check-prefix=SINGLE-64A-WARN %s
# SINGLE-64A-WARN: FP ABI {{-msingle-float|-mgp32 -mfp64 -mno-odd-spreg}} is incompatible with {{-mgp32 -mfp64 -mno-odd-spreg|-msingle-float}}
-# RUN: lld -flavor gnu -target mipsel -shared -o %t10 %t-soft.o %t-64.o 2>&1 \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t10 %t-soft.o %t-64.o 2>&1 \
# RUN: | FileCheck -check-prefix=SOFT-64-WARN %s
# SOFT-64-WARN: FP ABI {{-msoft-float|-mgp32 -mfp64}} is incompatible with {{-mgp32 -mfp64|-msoft-float}}
-# RUN: lld -flavor gnu -target mipsel -shared -o %t11 %t-soft.o %t-64a.o 2>&1 \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t11 %t-soft.o %t-64a.o 2>&1 \
# RUN: | FileCheck -check-prefix=SOFT-64A-WARN %s
# SOFT-64A-WARN: FP ABI {{-msoft-float|-mgp32 -mfp64 -mno-odd-spreg}} is incompatible with {{-mgp32 -mfp64 -mno-odd-spreg|-msoft-float}}
diff --git a/lld/test/elf/Mips/abi-flags-06.test b/lld/test/elf/Mips/abi-flags-06.test
index 4837c9691a5..d7df379039b 100644
--- a/lld/test/elf/Mips/abi-flags-06.test
+++ b/lld/test/elf/Mips/abi-flags-06.test
@@ -7,7 +7,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-abi.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-elf.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-abi.o %t-elf.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-abi.o %t-elf.o
# RUN: llvm-readobj -mips-abi-flags %t.so | FileCheck %s
# CHECK: MIPS ABI Flags {
diff --git a/lld/test/elf/Mips/abi-flags-07.test b/lld/test/elf/Mips/abi-flags-07.test
index 3f14128b724..6cae9b2feb4 100644
--- a/lld/test/elf/Mips/abi-flags-07.test
+++ b/lld/test/elf/Mips/abi-flags-07.test
@@ -3,7 +3,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t1.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t1.o %t2.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t1.o %t2.o
# RUN: llvm-readobj -mips-abi-flags %t.so | FileCheck %s
# CHECK: There is no .MIPS.abiflags section in the file.
diff --git a/lld/test/elf/Mips/abi-flags-08.test b/lld/test/elf/Mips/abi-flags-08.test
index d14e40a37f2..c4b75bcf451 100644
--- a/lld/test/elf/Mips/abi-flags-08.test
+++ b/lld/test/elf/Mips/abi-flags-08.test
@@ -4,11 +4,11 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-isa.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-ext.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-ases.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t1.so %t-isa.o 2>&1 \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t1.so %t-isa.o 2>&1 \
# RUN: | FileCheck -check-prefix=ISA-ERR %s
-# RUN: lld -flavor gnu -target mipsel -shared -o %t2.so %t-ext.o 2>&1 \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t2.so %t-ext.o 2>&1 \
# RUN: | FileCheck -check-prefix=EXT-ERR %s
-# RUN: lld -flavor gnu -target mipsel -shared -o %t3.so %t-ases.o 2>&1 \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t3.so %t-ases.o 2>&1 \
# RUN: | FileCheck -check-prefix=ASE-ERR %s
# RUN: llvm-readobj -mips-abi-flags %t1.so %t2.so %t3.so \
# RUN: | FileCheck -check-prefix=SEC %s
diff --git a/lld/test/elf/Mips/abi-flags-09.test b/lld/test/elf/Mips/abi-flags-09.test
index 8175466c708..1ab03abe381 100644
--- a/lld/test/elf/Mips/abi-flags-09.test
+++ b/lld/test/elf/Mips/abi-flags-09.test
@@ -2,7 +2,7 @@
# It should go right after the PT_INTERP segment.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-readobj -program-headers %t.exe | FileCheck %s
# CHECK: ProgramHeader {
diff --git a/lld/test/elf/Mips/abi-flags-10.test b/lld/test/elf/Mips/abi-flags-10.test
index 566508dee8f..50732d5c115 100644
--- a/lld/test/elf/Mips/abi-flags-10.test
+++ b/lld/test/elf/Mips/abi-flags-10.test
@@ -2,7 +2,7 @@
# if there is a SHT_MIPS_ABIFLAGS section.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-readobj -program-headers %t.exe | FileCheck %s
# CHECK: ProgramHeaders [
diff --git a/lld/test/elf/Mips/abi-flags-11.test b/lld/test/elf/Mips/abi-flags-11.test
index 4cd56261aca..e0e8547abbc 100644
--- a/lld/test/elf/Mips/abi-flags-11.test
+++ b/lld/test/elf/Mips/abi-flags-11.test
@@ -2,7 +2,7 @@
# It should go right after the PT_INTERP segment.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-readobj -program-headers %t.exe | FileCheck %s
# CHECK: ProgramHeader {
diff --git a/lld/test/elf/Mips/base-address-64.test b/lld/test/elf/Mips/base-address-64.test
index 78a81dea9a4..6b553d22782 100644
--- a/lld/test/elf/Mips/base-address-64.test
+++ b/lld/test/elf/Mips/base-address-64.test
@@ -2,7 +2,7 @@
# equal to 0x400000 and the MIPS_BASE_ADDRESS dynamic tag's value should
# be the same.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64el --noinhibit-exec -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips64el --noinhibit-exec -o %t.exe %t.o
# RUN: llvm-readobj -dynamic-table -program-headers %t.exe | FileCheck %s
# CHECK: DynamicSection [ (15 entries)
diff --git a/lld/test/elf/Mips/base-address.test b/lld/test/elf/Mips/base-address.test
index 4e9a1fbd23c..67c04326cc1 100644
--- a/lld/test/elf/Mips/base-address.test
+++ b/lld/test/elf/Mips/base-address.test
@@ -2,7 +2,7 @@
# equal to 0x400000 and the MIPS_BASE_ADDRESS dynamic tag's value should
# be the same.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel --noinhibit-exec -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel --noinhibit-exec -o %t.exe %t.o
# RUN: llvm-readobj -dynamic-table -program-headers %t.exe | FileCheck %s
# CHECK: DynamicSection [ (15 entries)
diff --git a/lld/test/elf/Mips/ctors-order.test b/lld/test/elf/Mips/ctors-order.test
index 7db35e6556d..b33ed43292e 100644
--- a/lld/test/elf/Mips/ctors-order.test
+++ b/lld/test/elf/Mips/ctors-order.test
@@ -3,9 +3,9 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-crtbeginS.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-crtendS.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-obj.o
-# RUN: lld -flavor gnu -target mipsel -shared --output-filetype=yaml \
+# RUN: lld -flavor old-gnu -target mipsel -shared --output-filetype=yaml \
# RUN: %t-crtbeginS.o %t-obj.o %t-crtendS.o | FileCheck %s
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so \
# RUN: %t-crtbeginS.o %t-obj.o %t-crtendS.o
# RUN: llvm-objdump -s %t.so | FileCheck -check-prefix=RAW %s
diff --git a/lld/test/elf/Mips/driver-hash-style.test b/lld/test/elf/Mips/driver-hash-style.test
index e7ffac3ff74..0ab636c427c 100644
--- a/lld/test/elf/Mips/driver-hash-style.test
+++ b/lld/test/elf/Mips/driver-hash-style.test
@@ -4,9 +4,9 @@
# because it is the only style supported by MIPS ABI.
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
-# RUN: not lld -flavor gnu -target mips --hash-style=both %t.o -o %t.exe 2>&1 \
+# RUN: not lld -flavor old-gnu -target mips --hash-style=both %t.o -o %t.exe 2>&1 \
# RUN: | FileCheck %s
-# RUN: not lld -flavor gnu -target mips --hash-style=gnu %t.o -o %t.exe 2>&1 \
+# RUN: not lld -flavor old-gnu -target mips --hash-style=gnu %t.o -o %t.exe 2>&1 \
# RUN: | FileCheck %s
# CHECK: error: .gnu.hash is incompatible with the MIPS ABI
diff --git a/lld/test/elf/Mips/dt-textrel-64.test b/lld/test/elf/Mips/dt-textrel-64.test
index 32cc99e54b2..152e8237279 100644
--- a/lld/test/elf/Mips/dt-textrel-64.test
+++ b/lld/test/elf/Mips/dt-textrel-64.test
@@ -2,9 +2,9 @@
# .dynamic section contains the DT_TEXTREL tag.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mips64el -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mips64el -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -dynamic-table %t.exe | FileCheck %s
# CHECK: 0x{{[0-9A-F]+}} TEXTREL
diff --git a/lld/test/elf/Mips/dt-textrel.test b/lld/test/elf/Mips/dt-textrel.test
index ca854dff8e5..af86f492627 100644
--- a/lld/test/elf/Mips/dt-textrel.test
+++ b/lld/test/elf/Mips/dt-textrel.test
@@ -2,9 +2,9 @@
# .dynamic section contains the DT_TEXTREL tag.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -dynamic-table %t.exe | FileCheck %s
# CHECK: 0x{{[0-9A-F]+}} TEXTREL
diff --git a/lld/test/elf/Mips/dynamic-linking.test b/lld/test/elf/Mips/dynamic-linking.test
index 41920f844cf..aeab7645ed5 100644
--- a/lld/test/elf/Mips/dynamic-linking.test
+++ b/lld/test/elf/Mips/dynamic-linking.test
@@ -3,17 +3,17 @@
# Check _DYNAMIC_LINKING symbol definition.
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
-# RUN: lld -flavor gnu -target mips %t.o -o %t.exe
+# RUN: lld -flavor old-gnu -target mips %t.o -o %t.exe
# RUN: llvm-nm %t.exe | FileCheck -check-prefix=EXE-DYN %s
# EXE-DYN: 00000001 A _DYNAMIC_LINKING
-# RUN: lld -flavor gnu -target mips -static %t.o -o %t.exe
+# RUN: lld -flavor old-gnu -target mips -static %t.o -o %t.exe
# RUN: llvm-nm -just-symbol-name %t.exe | FileCheck -check-prefix=EXE-STATIC %s
# EXE-STATIC-NOT: _DYNAMIC_LINKING
-# RUN: lld -flavor gnu -target mips -shared %t.o -o %t.so
+# RUN: lld -flavor old-gnu -target mips -shared %t.o -o %t.so
# RUN: llvm-nm -just-symbol-name %t.so | FileCheck -check-prefix=DYNLIB %s
# DYNLIB-NOT: _DYNAMIC_LINKING
diff --git a/lld/test/elf/Mips/dynamic-sym.test b/lld/test/elf/Mips/dynamic-sym.test
index 7695b114926..43a69d82c3a 100644
--- a/lld/test/elf/Mips/dynamic-sym.test
+++ b/lld/test/elf/Mips/dynamic-sym.test
@@ -1,7 +1,7 @@
# Check _DYNAMIC symbol's value
#
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared -e T0 -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -e T0 -o %t.so %t.o
# RUN: llvm-objdump -h -t %t.so | FileCheck -check-prefix=SHARED %s
# SHARED: Sections:
@@ -11,7 +11,7 @@
# SHARED: SYMBOL TABLE:
# SHARED: [[ADDR]] g .dynamic 00000000 _DYNAMIC
-# RUN: lld -flavor gnu -target mipsel -e main -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e main -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -h -t %t.exe | FileCheck -check-prefix=EXE %s
# EXE: Sections:
diff --git a/lld/test/elf/Mips/dynlib-dynamic.test b/lld/test/elf/Mips/dynlib-dynamic.test
index 54afdec263a..fca036a5262 100644
--- a/lld/test/elf/Mips/dynlib-dynamic.test
+++ b/lld/test/elf/Mips/dynlib-dynamic.test
@@ -2,7 +2,7 @@
# Build shared library
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared --noinhibit-exec -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared --noinhibit-exec -o %t.so %t.o
# RUN: llvm-readobj -dynamic-table %t.so | FileCheck %s
# CHECK: Format: ELF32-mips
diff --git a/lld/test/elf/Mips/dynlib-dynsym-micro.test b/lld/test/elf/Mips/dynlib-dynsym-micro.test
index 1d588f77157..6757847fac7 100644
--- a/lld/test/elf/Mips/dynlib-dynsym-micro.test
+++ b/lld/test/elf/Mips/dynlib-dynsym-micro.test
@@ -6,11 +6,11 @@
# Build shared library
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared --noinhibit-exec -o %t-so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared --noinhibit-exec -o %t-so %t.o
# RUN: llvm-readobj -dyn-symbols %t-so | FileCheck -check-prefix=CHECK-DYN %s
# Build shared library (yaml format)
-# RUN: lld -flavor gnu -target mipsel -shared --noinhibit-exec \
+# RUN: lld -flavor old-gnu -target mipsel -shared --noinhibit-exec \
# RUN: --output-filetype=yaml -o %t-yaml %t.o
# RUN: FileCheck -check-prefix=CHECK-GOT %s < %t-yaml
diff --git a/lld/test/elf/Mips/dynlib-dynsym.test b/lld/test/elf/Mips/dynlib-dynsym.test
index baed9ae8457..23b0cd6a90c 100644
--- a/lld/test/elf/Mips/dynlib-dynsym.test
+++ b/lld/test/elf/Mips/dynlib-dynsym.test
@@ -2,11 +2,11 @@
# Build shared library
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared --noinhibit-exec -o %t-so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared --noinhibit-exec -o %t-so %t.o
# RUN: llvm-readobj -dyn-symbols %t-so | FileCheck -check-prefix=CHECK-DYN %s
# Build shared library (yaml format)
-# RUN: lld -flavor gnu -target mipsel -shared --noinhibit-exec \
+# RUN: lld -flavor old-gnu -target mipsel -shared --noinhibit-exec \
# RUN: --output-filetype=yaml -o %t-yaml %t.o
# RUN: FileCheck -check-prefix=CHECK-GOT %s < %t-yaml
diff --git a/lld/test/elf/Mips/dynlib-fileheader-64.test b/lld/test/elf/Mips/dynlib-fileheader-64.test
index 83461a88bda..f3b45d4d738 100644
--- a/lld/test/elf/Mips/dynlib-fileheader-64.test
+++ b/lld/test/elf/Mips/dynlib-fileheader-64.test
@@ -2,7 +2,7 @@
# Build shared library
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t.o
# RUN: llvm-readobj -file-headers %t.so | FileCheck %s
# CHECK: Format: ELF64-mips
diff --git a/lld/test/elf/Mips/dynlib-fileheader-micro-64.test b/lld/test/elf/Mips/dynlib-fileheader-micro-64.test
index c43e255e48c..531cee134ca 100644
--- a/lld/test/elf/Mips/dynlib-fileheader-micro-64.test
+++ b/lld/test/elf/Mips/dynlib-fileheader-micro-64.test
@@ -2,7 +2,7 @@
# Build shared library
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t.o
# RUN: llvm-readobj -file-headers %t.so | FileCheck %s
# CHECK: Format: ELF64-mips
diff --git a/lld/test/elf/Mips/dynlib-fileheader-micro.test b/lld/test/elf/Mips/dynlib-fileheader-micro.test
index 3a5bf8769b4..dcd38f1036d 100644
--- a/lld/test/elf/Mips/dynlib-fileheader-micro.test
+++ b/lld/test/elf/Mips/dynlib-fileheader-micro.test
@@ -2,7 +2,7 @@
# Build shared library
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o
# RUN: llvm-readobj -file-headers %t.so | FileCheck %s
# CHECK: Format: ELF32-mips
diff --git a/lld/test/elf/Mips/dynlib-fileheader.test b/lld/test/elf/Mips/dynlib-fileheader.test
index f74824e136a..a3b4a19a90f 100644
--- a/lld/test/elf/Mips/dynlib-fileheader.test
+++ b/lld/test/elf/Mips/dynlib-fileheader.test
@@ -2,7 +2,7 @@
# Build shared library
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o
# RUN: llvm-readobj -file-headers %t.so | FileCheck %s
# CHECK: Format: ELF32-mips
diff --git a/lld/test/elf/Mips/dynsym-table-1.test b/lld/test/elf/Mips/dynsym-table-1.test
index 158792c396e..8821ae35825 100644
--- a/lld/test/elf/Mips/dynsym-table-1.test
+++ b/lld/test/elf/Mips/dynsym-table-1.test
@@ -8,9 +8,9 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-bar.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-foo.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-main.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t-bar.so %t-bar.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t-foo.so %t-foo.o %t-bar.so
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe --as-needed \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t-bar.so %t-bar.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t-foo.so %t-foo.o %t-bar.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe --as-needed \
# RUN: %t-main.o %t-foo.so %t-bar.so
# RUN: llvm-readobj -dt -dynamic-table %t.exe | FileCheck %s
diff --git a/lld/test/elf/Mips/dynsym-table-2.test b/lld/test/elf/Mips/dynsym-table-2.test
index 01b8c8ab895..ad85bfe84e4 100644
--- a/lld/test/elf/Mips/dynsym-table-2.test
+++ b/lld/test/elf/Mips/dynsym-table-2.test
@@ -6,8 +6,8 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-bar.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-foo.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t-bar.so %t-bar.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t-foo.so %t-foo.o %t-bar.so
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t-bar.so %t-bar.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t-foo.so %t-foo.o %t-bar.so
# RUN: llvm-readobj -dt -dynamic-table %t-foo.so | FileCheck %s
# CHECK: DynamicSymbols [
diff --git a/lld/test/elf/Mips/e-flags-merge-1-64.test b/lld/test/elf/Mips/e-flags-merge-1-64.test
index d5719539baa..3e52afd223c 100644
--- a/lld/test/elf/Mips/e-flags-merge-1-64.test
+++ b/lld/test/elf/Mips/e-flags-merge-1-64.test
@@ -2,7 +2,7 @@
# file has unsupported ASE flags.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-mips16.o
-# RUN: not lld -flavor gnu -target mips64el -e T -o %t.exe %t-mips16.o 2>&1 | \
+# RUN: not lld -flavor old-gnu -target mips64el -e T -o %t.exe %t-mips16.o 2>&1 | \
# RUN: FileCheck -check-prefix=MIPS16 %s
# MIPS16: Unsupported extension: MIPS16
diff --git a/lld/test/elf/Mips/e-flags-merge-1.test b/lld/test/elf/Mips/e-flags-merge-1.test
index 1f1d7aca6c4..bc100534112 100644
--- a/lld/test/elf/Mips/e-flags-merge-1.test
+++ b/lld/test/elf/Mips/e-flags-merge-1.test
@@ -2,11 +2,11 @@
# or unsupported ABI and ARCH flags or unsupported ASE flags.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-no-abi.o
-# RUN: not lld -flavor gnu -target mipsel -e T -o %t.exe %t-no-abi.o 2>&1 | \
+# RUN: not lld -flavor old-gnu -target mipsel -e T -o %t.exe %t-no-abi.o 2>&1 | \
# RUN: FileCheck -check-prefix=INVALID-ABI %s
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-mips16.o
-# RUN: not lld -flavor gnu -target mipsel -e T -o %t.exe %t-mips16.o 2>&1 | \
+# RUN: not lld -flavor old-gnu -target mipsel -e T -o %t.exe %t-mips16.o 2>&1 | \
# RUN: FileCheck -check-prefix=MIPS16 %s
# INVALID-ABI: Unsupported ABI
diff --git a/lld/test/elf/Mips/e-flags-merge-10.test b/lld/test/elf/Mips/e-flags-merge-10.test
index a0aa45d5f2c..5dacaa0e069 100644
--- a/lld/test/elf/Mips/e-flags-merge-10.test
+++ b/lld/test/elf/Mips/e-flags-merge-10.test
@@ -4,7 +4,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-32r2.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-32r6.o
-# RUN: not lld -flavor gnu -target mipsel -shared -o %t.so \
+# RUN: not lld -flavor old-gnu -target mipsel -shared -o %t.so \
# RUN: %t-32r2.o %t-32r6.o 2>&1 | FileCheck %s
# CHECK: Linking modules with incompatible ISA
diff --git a/lld/test/elf/Mips/e-flags-merge-11.test b/lld/test/elf/Mips/e-flags-merge-11.test
index b4c0039bd19..e61eb0d6d65 100644
--- a/lld/test/elf/Mips/e-flags-merge-11.test
+++ b/lld/test/elf/Mips/e-flags-merge-11.test
@@ -4,7 +4,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-64r2.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-64r6.o
-# RUN: not lld -flavor gnu -target mips64el -shared -o %t.so \
+# RUN: not lld -flavor old-gnu -target mips64el -shared -o %t.so \
# RUN: %t-64r2.o %t-64r6.o 2>&1 | FileCheck %s
# CHECK: Linking modules with incompatible ISA
diff --git a/lld/test/elf/Mips/e-flags-merge-12.test b/lld/test/elf/Mips/e-flags-merge-12.test
index 3cc55792e20..0a0c43fc996 100644
--- a/lld/test/elf/Mips/e-flags-merge-12.test
+++ b/lld/test/elf/Mips/e-flags-merge-12.test
@@ -3,7 +3,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-o32.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-n32.o
-# RUN: not lld -flavor gnu -target mipsel -shared -o %t.so \
+# RUN: not lld -flavor old-gnu -target mipsel -shared -o %t.so \
# RUN: %t-o32.o %t-n32.o 2>&1 | FileCheck %s
# CHECK: Linking modules with incompatible ABI
diff --git a/lld/test/elf/Mips/e-flags-merge-2-64.test b/lld/test/elf/Mips/e-flags-merge-2-64.test
index a169e7ea164..4e024d2a465 100644
--- a/lld/test/elf/Mips/e-flags-merge-2-64.test
+++ b/lld/test/elf/Mips/e-flags-merge-2-64.test
@@ -2,7 +2,7 @@
# file to the generated executable
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64el -e T -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips64el -e T -o %t.exe %t.o
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
# CHECK: Flags [ (0x62000001)
diff --git a/lld/test/elf/Mips/e-flags-merge-2.test b/lld/test/elf/Mips/e-flags-merge-2.test
index 41d4a0b0c45..3ca53172872 100644
--- a/lld/test/elf/Mips/e-flags-merge-2.test
+++ b/lld/test/elf/Mips/e-flags-merge-2.test
@@ -2,7 +2,7 @@
# file to the generated executable
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T -o %t.exe %t.o
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
# CHECK: Flags [ (0x52001001)
diff --git a/lld/test/elf/Mips/e-flags-merge-3-64.test b/lld/test/elf/Mips/e-flags-merge-3-64.test
index 54065a63fb9..45326813e12 100644
--- a/lld/test/elf/Mips/e-flags-merge-3-64.test
+++ b/lld/test/elf/Mips/e-flags-merge-3-64.test
@@ -5,20 +5,20 @@
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-pic.o
# RUN: yaml2obj -format=elf -docnum 4 %s > %t-both.o
-# RUN: lld -flavor gnu -target mips64el -e T1 -o %t-abi1.exe \
+# RUN: lld -flavor old-gnu -target mips64el -e T1 -o %t-abi1.exe \
# RUN: %t-none.o %t-pic.o 2>&1 | FileCheck -check-prefix=ABI-CALLS-WARN %s
# RUN: llvm-readobj -file-headers %t-abi1.exe \
# RUN: | FileCheck -check-prefix=ABI-CALLS1 %s
-# RUN: lld -flavor gnu -target mips64el -e T1 -o %t-abi2.exe \
+# RUN: lld -flavor old-gnu -target mips64el -e T1 -o %t-abi2.exe \
# RUN: %t-cpic.o %t-none.o 2>&1 | FileCheck -check-prefix=ABI-CALLS-WARN %s
# RUN: llvm-readobj -file-headers %t-abi2.exe \
# RUN: | FileCheck -check-prefix=ABI-CALLS2 %s
-# RUN: lld -flavor gnu -target mips64el -e T2 -o %t-cpic.exe %t-cpic.o %t-pic.o
+# RUN: lld -flavor old-gnu -target mips64el -e T2 -o %t-cpic.exe %t-cpic.o %t-pic.o
# RUN: llvm-readobj -file-headers %t-cpic.exe | FileCheck -check-prefix=CPIC %s
-# RUN: lld -flavor gnu -target mips64el -e T3 -o %t-both.exe %t-pic.o %t-both.o
+# RUN: lld -flavor old-gnu -target mips64el -e T3 -o %t-both.exe %t-pic.o %t-both.o
# RUN: llvm-readobj -file-headers %t-both.exe | FileCheck -check-prefix=BOTH %s
# ABI-CALLS-WARN: lld warning: linking abicalls and non-abicalls files
diff --git a/lld/test/elf/Mips/e-flags-merge-3.test b/lld/test/elf/Mips/e-flags-merge-3.test
index e2d9f6c2e2f..612f0b45863 100644
--- a/lld/test/elf/Mips/e-flags-merge-3.test
+++ b/lld/test/elf/Mips/e-flags-merge-3.test
@@ -5,20 +5,20 @@
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-pic.o
# RUN: yaml2obj -format=elf -docnum 4 %s > %t-both.o
-# RUN: lld -flavor gnu -target mipsel -e T1 -o %t-abi1.exe \
+# RUN: lld -flavor old-gnu -target mipsel -e T1 -o %t-abi1.exe \
# RUN: %t-none.o %t-pic.o 2>&1 | FileCheck -check-prefix=ABI-CALLS-WARN %s
# RUN: llvm-readobj -file-headers %t-abi1.exe \
# RUN: | FileCheck -check-prefix=ABI-CALLS1 %s
-# RUN: lld -flavor gnu -target mipsel -e T1 -o %t-abi2.exe \
+# RUN: lld -flavor old-gnu -target mipsel -e T1 -o %t-abi2.exe \
# RUN: %t-cpic.o %t-none.o 2>&1 | FileCheck -check-prefix=ABI-CALLS-WARN %s
# RUN: llvm-readobj -file-headers %t-abi2.exe \
# RUN: | FileCheck -check-prefix=ABI-CALLS2 %s
-# RUN: lld -flavor gnu -target mipsel -e T2 -o %t-cpic.exe %t-cpic.o %t-pic.o
+# RUN: lld -flavor old-gnu -target mipsel -e T2 -o %t-cpic.exe %t-cpic.o %t-pic.o
# RUN: llvm-readobj -file-headers %t-cpic.exe | FileCheck -check-prefix=CPIC %s
-# RUN: lld -flavor gnu -target mipsel -e T3 -o %t-both.exe %t-pic.o %t-both.o
+# RUN: lld -flavor old-gnu -target mipsel -e T3 -o %t-both.exe %t-pic.o %t-both.o
# RUN: llvm-readobj -file-headers %t-both.exe | FileCheck -check-prefix=BOTH %s
# ABI-CALLS-WARN: lld warning: linking abicalls and non-abicalls files
diff --git a/lld/test/elf/Mips/e-flags-merge-4-64.test b/lld/test/elf/Mips/e-flags-merge-4-64.test
index 9ffa6134371..59a8bf131d9 100644
--- a/lld/test/elf/Mips/e-flags-merge-4-64.test
+++ b/lld/test/elf/Mips/e-flags-merge-4-64.test
@@ -4,7 +4,7 @@
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-noreorder.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-micro.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so \
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so \
# RUN: %t-none.o %t-noreorder.o %t-micro.o
# RUN: llvm-readobj -file-headers %t.so | FileCheck %s
diff --git a/lld/test/elf/Mips/e-flags-merge-4.test b/lld/test/elf/Mips/e-flags-merge-4.test
index 096b04d676e..6a2de375e62 100644
--- a/lld/test/elf/Mips/e-flags-merge-4.test
+++ b/lld/test/elf/Mips/e-flags-merge-4.test
@@ -4,7 +4,7 @@
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-noreorder.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-micro.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so \
# RUN: %t-none.o %t-noreorder.o %t-micro.o
# RUN: llvm-readobj -file-headers %t.so | FileCheck %s
diff --git a/lld/test/elf/Mips/e-flags-merge-5-64.test b/lld/test/elf/Mips/e-flags-merge-5-64.test
index cec5b092be4..f1fdac2c8c0 100644
--- a/lld/test/elf/Mips/e-flags-merge-5-64.test
+++ b/lld/test/elf/Mips/e-flags-merge-5-64.test
@@ -3,7 +3,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-32.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-64.o
-# RUN: not lld -flavor gnu -target mips64el -shared -o %t.so \
+# RUN: not lld -flavor old-gnu -target mips64el -shared -o %t.so \
# RUN: %t-32.o %t-64.o 2>&1 | FileCheck %s
# CHECK: ELF64 expected, but got ELF32
diff --git a/lld/test/elf/Mips/e-flags-merge-5.test b/lld/test/elf/Mips/e-flags-merge-5.test
index 10743acb85e..56edc4bfa10 100644
--- a/lld/test/elf/Mips/e-flags-merge-5.test
+++ b/lld/test/elf/Mips/e-flags-merge-5.test
@@ -3,7 +3,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-32.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-64.o
-# RUN: not lld -flavor gnu -target mipsel -shared -o %t.so \
+# RUN: not lld -flavor old-gnu -target mipsel -shared -o %t.so \
# RUN: %t-32.o %t-64.o 2>&1 | FileCheck %s
# CHECK: ELF32 expected, but got ELF64
diff --git a/lld/test/elf/Mips/e-flags-merge-6-64.test b/lld/test/elf/Mips/e-flags-merge-6-64.test
index fbc32b7135b..9f83365441a 100644
--- a/lld/test/elf/Mips/e-flags-merge-6-64.test
+++ b/lld/test/elf/Mips/e-flags-merge-6-64.test
@@ -5,7 +5,7 @@
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-m64.o
# RUN: yaml2obj -format=elf -docnum 4 %s > %t-m64r2.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so \
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so \
# RUN: %t-m64.o %t-m5.o %t-m64r2.o %t-m3.o
# RUN: llvm-readobj -file-headers %t.so | FileCheck %s
diff --git a/lld/test/elf/Mips/e-flags-merge-6.test b/lld/test/elf/Mips/e-flags-merge-6.test
index 759c8b63c97..0d8bcee5ad6 100644
--- a/lld/test/elf/Mips/e-flags-merge-6.test
+++ b/lld/test/elf/Mips/e-flags-merge-6.test
@@ -5,7 +5,7 @@
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-m32.o
# RUN: yaml2obj -format=elf -docnum 4 %s > %t-m32r2.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so \
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so \
# RUN: %t-m32.o %t-m2.o %t-m32r2.o %t-m1.o
# RUN: llvm-readobj -file-headers %t.so | FileCheck %s
diff --git a/lld/test/elf/Mips/e-flags-merge-7-64.test b/lld/test/elf/Mips/e-flags-merge-7-64.test
index 07ed6bb5483..0e74ac53684 100644
--- a/lld/test/elf/Mips/e-flags-merge-7-64.test
+++ b/lld/test/elf/Mips/e-flags-merge-7-64.test
@@ -3,7 +3,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-2008.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-legacy.o
-# RUN: not lld -flavor gnu -target mips64el -shared -o %t.so \
+# RUN: not lld -flavor old-gnu -target mips64el -shared -o %t.so \
# RUN: %t-2008.o %t-legacy.o 2>&1 | FileCheck %s
# CHECK: Linking -mnan=2008 and -mnan=legacy modules
diff --git a/lld/test/elf/Mips/e-flags-merge-7.test b/lld/test/elf/Mips/e-flags-merge-7.test
index 7e114ff968f..08051df506b 100644
--- a/lld/test/elf/Mips/e-flags-merge-7.test
+++ b/lld/test/elf/Mips/e-flags-merge-7.test
@@ -3,7 +3,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-2008.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-legacy.o
-# RUN: not lld -flavor gnu -target mipsel -shared -o %t.so \
+# RUN: not lld -flavor old-gnu -target mipsel -shared -o %t.so \
# RUN: %t-2008.o %t-legacy.o 2>&1 | FileCheck %s
# CHECK: Linking -mnan=2008 and -mnan=legacy modules
diff --git a/lld/test/elf/Mips/e-flags-merge-8.test b/lld/test/elf/Mips/e-flags-merge-8.test
index 57af77d7026..2a2fdfee3c4 100644
--- a/lld/test/elf/Mips/e-flags-merge-8.test
+++ b/lld/test/elf/Mips/e-flags-merge-8.test
@@ -5,7 +5,7 @@
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-64.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-64r2.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-32.o %t-64.o %t-64r2.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-32.o %t-64.o %t-64r2.o
# RUN: llvm-readobj -file-headers %t.so | FileCheck %s
# CHECK: Flags [ (0x80001100)
diff --git a/lld/test/elf/Mips/e-flags-merge-9.test b/lld/test/elf/Mips/e-flags-merge-9.test
index dea32f07cb9..ada24d788c9 100644
--- a/lld/test/elf/Mips/e-flags-merge-9.test
+++ b/lld/test/elf/Mips/e-flags-merge-9.test
@@ -4,7 +4,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-32r2.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-64.o
-# RUN: not lld -flavor gnu -target mipsel -shared -o %t.so \
+# RUN: not lld -flavor old-gnu -target mipsel -shared -o %t.so \
# RUN: %t-32r2.o %t-64.o 2>&1 | FileCheck %s
# CHECK: Linking modules with incompatible ISA
diff --git a/lld/test/elf/Mips/entry-name.test b/lld/test/elf/Mips/entry-name.test
index 992dafe2002..f6ce0c4f223 100644
--- a/lld/test/elf/Mips/entry-name.test
+++ b/lld/test/elf/Mips/entry-name.test
@@ -1,6 +1,6 @@
# Check name of executable entry symbol.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel --noinhibit-exec -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel --noinhibit-exec -o %t.exe %t.o
# RUN: llvm-nm %t.exe | FileCheck %s
# CHECK: U __start
diff --git a/lld/test/elf/Mips/exe-dynamic.test b/lld/test/elf/Mips/exe-dynamic.test
index 44fffe690d3..93fdce9fdc7 100644
--- a/lld/test/elf/Mips/exe-dynamic.test
+++ b/lld/test/elf/Mips/exe-dynamic.test
@@ -2,11 +2,11 @@
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e glob -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e glob -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -dynamic-table %t.exe | FileCheck %s
# CHECK: Format: ELF32-mips
diff --git a/lld/test/elf/Mips/exe-dynsym-micro.test b/lld/test/elf/Mips/exe-dynsym-micro.test
index d8978452c84..477e174f3d6 100644
--- a/lld/test/elf/Mips/exe-dynsym-micro.test
+++ b/lld/test/elf/Mips/exe-dynsym-micro.test
@@ -5,11 +5,11 @@
# Build executable
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e glob -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e glob -o %t.exe %t.o
# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK-DYN %s
# Build executabl (yaml format)e
-# RUN: lld -flavor gnu -target mipsel -e glob \
+# RUN: lld -flavor old-gnu -target mipsel -e glob \
# RUN: --output-filetype=yaml -o %t.yaml %t.o
# RUN: FileCheck -check-prefix=CHECK-GOT %s < %t.yaml
diff --git a/lld/test/elf/Mips/exe-dynsym.test b/lld/test/elf/Mips/exe-dynsym.test
index 622daf19a1f..c50ce67d5f5 100644
--- a/lld/test/elf/Mips/exe-dynsym.test
+++ b/lld/test/elf/Mips/exe-dynsym.test
@@ -3,11 +3,11 @@
# Build executable
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e glob -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e glob -o %t.exe %t.o
# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK-DYN %s
# Build executabl (yaml format)e
-# RUN: lld -flavor gnu -target mipsel -e glob \
+# RUN: lld -flavor old-gnu -target mipsel -e glob \
# RUN: --output-filetype=yaml -o %t.yaml %t.o
# RUN: FileCheck -check-prefix=CHECK-GOT %s < %t.yaml
diff --git a/lld/test/elf/Mips/exe-fileheader-02.test b/lld/test/elf/Mips/exe-fileheader-02.test
index c02a89741f3..b3cd88c139b 100644
--- a/lld/test/elf/Mips/exe-fileheader-02.test
+++ b/lld/test/elf/Mips/exe-fileheader-02.test
@@ -2,7 +2,7 @@
# file without EF_MIPS_PIC in the ELF header.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
# CHECK: Format: ELF32-mips
diff --git a/lld/test/elf/Mips/exe-fileheader-03.test b/lld/test/elf/Mips/exe-fileheader-03.test
index 00cd77b620c..dfe4fcc43e6 100644
--- a/lld/test/elf/Mips/exe-fileheader-03.test
+++ b/lld/test/elf/Mips/exe-fileheader-03.test
@@ -2,7 +2,7 @@
# file with FP_64 / FP_64A floating point abi flags.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
# CHECK: Format: ELF32-mips
diff --git a/lld/test/elf/Mips/exe-fileheader-64.test b/lld/test/elf/Mips/exe-fileheader-64.test
index 6a0a4e126bf..20bb43a216d 100644
--- a/lld/test/elf/Mips/exe-fileheader-64.test
+++ b/lld/test/elf/Mips/exe-fileheader-64.test
@@ -2,7 +2,7 @@
# Build executable
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target mips64el -e glob -o %t.exe %t-o.o
+# RUN: lld -flavor old-gnu -target mips64el -e glob -o %t.exe %t-o.o
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
# CHECK: Format: ELF64-mips
diff --git a/lld/test/elf/Mips/exe-fileheader-be-64.test b/lld/test/elf/Mips/exe-fileheader-be-64.test
index 9e177d00dcd..70457fe217c 100644
--- a/lld/test/elf/Mips/exe-fileheader-be-64.test
+++ b/lld/test/elf/Mips/exe-fileheader-be-64.test
@@ -1,7 +1,7 @@
# Check ELF Header for non-pic big-endian 64-bit executable file.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips64 -o %t.exe %t.o
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
# CHECK: Format: ELF64-mips
diff --git a/lld/test/elf/Mips/exe-fileheader-be.test b/lld/test/elf/Mips/exe-fileheader-be.test
index cc2b795e9dd..292a92e5909 100644
--- a/lld/test/elf/Mips/exe-fileheader-be.test
+++ b/lld/test/elf/Mips/exe-fileheader-be.test
@@ -1,7 +1,7 @@
# Check ELF Header for non-pic big-endian 32-bit executable file.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips -o %t.exe %t.o
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
# CHECK: Format: ELF32-mips
diff --git a/lld/test/elf/Mips/exe-fileheader-micro-64.test b/lld/test/elf/Mips/exe-fileheader-micro-64.test
index 605c00a0a46..a37d2d71063 100644
--- a/lld/test/elf/Mips/exe-fileheader-micro-64.test
+++ b/lld/test/elf/Mips/exe-fileheader-micro-64.test
@@ -2,7 +2,7 @@
# Build executable
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target mips64el -e glob -o %t.exe %t-o.o
+# RUN: lld -flavor old-gnu -target mips64el -e glob -o %t.exe %t-o.o
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
# CHECK: Format: ELF64-mips
diff --git a/lld/test/elf/Mips/exe-fileheader-micro.test b/lld/test/elf/Mips/exe-fileheader-micro.test
index 83e0831c67c..0adaf5b1737 100644
--- a/lld/test/elf/Mips/exe-fileheader-micro.test
+++ b/lld/test/elf/Mips/exe-fileheader-micro.test
@@ -3,7 +3,7 @@
# Build executable
# RUN: yaml2obj -format=elf %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e glob -o %t.exe %t-o.o
+# RUN: lld -flavor old-gnu -target mipsel -e glob -o %t.exe %t-o.o
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
# CHECK: Format: ELF32-mips
diff --git a/lld/test/elf/Mips/exe-fileheader-n32.test b/lld/test/elf/Mips/exe-fileheader-n32.test
index 155414f537d..f6a1725b444 100644
--- a/lld/test/elf/Mips/exe-fileheader-n32.test
+++ b/lld/test/elf/Mips/exe-fileheader-n32.test
@@ -1,7 +1,7 @@
# Check ELF Header for N32 ABI executable file.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -o %t.exe %t.o
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
# CHECK: Format: ELF32-mips
diff --git a/lld/test/elf/Mips/exe-fileheader.test b/lld/test/elf/Mips/exe-fileheader.test
index 8504d87b31b..0188a682b3f 100644
--- a/lld/test/elf/Mips/exe-fileheader.test
+++ b/lld/test/elf/Mips/exe-fileheader.test
@@ -2,11 +2,11 @@
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e glob -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e glob -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
# CHECK: Format: ELF32-mips
diff --git a/lld/test/elf/Mips/exe-got-micro.test b/lld/test/elf/Mips/exe-got-micro.test
index dd08ba0c71e..7b3a919880d 100644
--- a/lld/test/elf/Mips/exe-got-micro.test
+++ b/lld/test/elf/Mips/exe-got-micro.test
@@ -4,11 +4,11 @@
#
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e glob \
+# RUN: lld -flavor old-gnu -target mipsel -e glob \
# RUN: --output-filetype=yaml -o %t.exe %t-o.o %t.so
# RUN: FileCheck -check-prefix=GOT %s < %t.exe
diff --git a/lld/test/elf/Mips/exe-got.test b/lld/test/elf/Mips/exe-got.test
index 63231710908..636de16b420 100644
--- a/lld/test/elf/Mips/exe-got.test
+++ b/lld/test/elf/Mips/exe-got.test
@@ -4,11 +4,11 @@
#
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e glob \
+# RUN: lld -flavor old-gnu -target mipsel -e glob \
# RUN: --output-filetype=yaml -o %t.exe %t-o.o %t.so
# RUN: FileCheck -check-prefix=GOT %s < %t.exe
diff --git a/lld/test/elf/Mips/got-page-32-micro.test b/lld/test/elf/Mips/got-page-32-micro.test
index a312db14a71..5457ab9f187 100644
--- a/lld/test/elf/Mips/got-page-32-micro.test
+++ b/lld/test/elf/Mips/got-page-32-micro.test
@@ -2,9 +2,9 @@
# in case of O32 ABI.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -symbols -dyn-symbols -mips-plt-got %t.exe \
# RUN: | FileCheck -check-prefix=GOT %s
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=RAW %s
diff --git a/lld/test/elf/Mips/got-page-32.test b/lld/test/elf/Mips/got-page-32.test
index 990d3e89d9a..44f45536d50 100644
--- a/lld/test/elf/Mips/got-page-32.test
+++ b/lld/test/elf/Mips/got-page-32.test
@@ -1,9 +1,9 @@
# Check handling of R_MIPS_GOT_DISP / PAGE / OFST relocations.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -symbols -dyn-symbols -mips-plt-got %t.exe \
# RUN: | FileCheck -check-prefix=GOT %s
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=RAW %s
diff --git a/lld/test/elf/Mips/got-page-64-micro.test b/lld/test/elf/Mips/got-page-64-micro.test
index 88c85dda102..37bae77001e 100644
--- a/lld/test/elf/Mips/got-page-64-micro.test
+++ b/lld/test/elf/Mips/got-page-64-micro.test
@@ -2,9 +2,9 @@
# in case of N64 ABI.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mips64el -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mips64el -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -symbols -dyn-symbols -mips-plt-got %t.exe \
# RUN: | FileCheck -check-prefix=GOT %s
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=RAW %s
diff --git a/lld/test/elf/Mips/got-page-64.test b/lld/test/elf/Mips/got-page-64.test
index c552fcb1d17..3c6ef57c78f 100644
--- a/lld/test/elf/Mips/got-page-64.test
+++ b/lld/test/elf/Mips/got-page-64.test
@@ -1,9 +1,9 @@
# Check handling of R_MIPS_GOT_DISP / PAGE / OFST relocations.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mips64el -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mips64el -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -symbols -dyn-symbols -mips-plt-got %t.exe \
# RUN: | FileCheck -check-prefix=GOT %s
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=RAW %s
diff --git a/lld/test/elf/Mips/got16-2.test b/lld/test/elf/Mips/got16-2.test
index 6f576536c54..01f11a5920c 100644
--- a/lld/test/elf/Mips/got16-2.test
+++ b/lld/test/elf/Mips/got16-2.test
@@ -2,7 +2,7 @@
# symbols when addresses of local data cross 64 KBytes border.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t-exe %t-obj
# RUN: llvm-objdump -s %t-exe | FileCheck %s
# CHECK: Contents of section .got:
diff --git a/lld/test/elf/Mips/got16-micro.test b/lld/test/elf/Mips/got16-micro.test
index d87b98c6acd..25de08e95c4 100644
--- a/lld/test/elf/Mips/got16-micro.test
+++ b/lld/test/elf/Mips/got16-micro.test
@@ -3,10 +3,10 @@
# Check handling of global/local R_MICROMIPS_GOT16 relocations.
# RUN: llvm-mc -triple=mipsel -mattr=micromips -relocation-model=pic \
# RUN: -filetype=obj -o=%t.o %s
-# RUN: lld -flavor gnu -target mipsel -shared --noinhibit-exec \
+# RUN: lld -flavor old-gnu -target mipsel -shared --noinhibit-exec \
# RUN: --output-filetype=yaml %t.o \
# RUN: | FileCheck -check-prefix YAML %s
-# RUN: lld -flavor gnu -target mipsel -shared --noinhibit-exec -o %t2 %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared --noinhibit-exec -o %t2 %t.o
# RUN: llvm-objdump -t -disassemble -mattr=micromips %t2 \
# RUN: | FileCheck -check-prefix RAW %s
diff --git a/lld/test/elf/Mips/got16.test b/lld/test/elf/Mips/got16.test
index 4a3fdfa5619..4dde15a11c2 100644
--- a/lld/test/elf/Mips/got16.test
+++ b/lld/test/elf/Mips/got16.test
@@ -2,10 +2,10 @@
# Check handling of global/local GOT16 relocations.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared --noinhibit-exec \
+# RUN: lld -flavor old-gnu -target mipsel -shared --noinhibit-exec \
# RUN: --output-filetype=yaml %t.o \
# RUN: | FileCheck -check-prefix YAML %s
-# RUN: lld -flavor gnu -target mipsel -shared --noinhibit-exec -o %t2 %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared --noinhibit-exec -o %t2 %t.o
# RUN: llvm-objdump -t -disassemble %t2 | FileCheck -check-prefix RAW %s
# Function glob
diff --git a/lld/test/elf/Mips/gotsym.test b/lld/test/elf/Mips/gotsym.test
index 9efd0dd4600..bc89ba5d376 100644
--- a/lld/test/elf/Mips/gotsym.test
+++ b/lld/test/elf/Mips/gotsym.test
@@ -1,7 +1,7 @@
# Check _gp_disp and GOT_OFFSET_TABLE value
#
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared --noinhibit-exec -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared --noinhibit-exec -o %t.so %t.o
# RUN: llvm-objdump -h -t %t.so | FileCheck -check-prefix=SHARED %s
# SHARED: Sections:
@@ -12,7 +12,7 @@
# SHARED: 00008ff0 g *ABS* 00000000 _gp
# SHARED: 00008ff0 g *ABS* 00000000 _gp_disp
-# RUN: lld -flavor gnu -target mipsel -e main --noinhibit-exec -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e main --noinhibit-exec -o %t.exe %t.o
# RUN: llvm-objdump -h -t %t.exe | FileCheck -check-prefix=EXE %s
# EXE: Sections:
diff --git a/lld/test/elf/Mips/gp-sym-1-micro.test b/lld/test/elf/Mips/gp-sym-1-micro.test
index fa67e22551d..0e1bea9c38d 100644
--- a/lld/test/elf/Mips/gp-sym-1-micro.test
+++ b/lld/test/elf/Mips/gp-sym-1-micro.test
@@ -2,9 +2,9 @@
# use "gp" value as target.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -symbols %t.exe | FileCheck -check-prefix=SYM %s
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=SEC %s
diff --git a/lld/test/elf/Mips/gp-sym-1.test b/lld/test/elf/Mips/gp-sym-1.test
index ef059a59c11..ebb73c3afd6 100644
--- a/lld/test/elf/Mips/gp-sym-1.test
+++ b/lld/test/elf/Mips/gp-sym-1.test
@@ -1,9 +1,9 @@
# Check that relocations against __gnu_local_gp use "gp" value as target.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -symbols %t.exe | FileCheck -check-prefix=SYM %s
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=SEC %s
diff --git a/lld/test/elf/Mips/gp-sym-2.test b/lld/test/elf/Mips/gp-sym-2.test
index 6b9e5a5e52d..b6d95f350af 100644
--- a/lld/test/elf/Mips/gp-sym-2.test
+++ b/lld/test/elf/Mips/gp-sym-2.test
@@ -9,11 +9,11 @@
# XFAIL: *
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t-1.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t-1.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t-1.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t-1.so
# RUN: llvm-readobj -r %t.exe | FileCheck -check-prefix=EXE %s
-# RUN: lld -flavor gnu -target mipsel -shared -o %t-2.so %t-o.o %t-1.so
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t-2.so %t-o.o %t-1.so
# RUN: llvm-readobj -r %t-2.so | FileCheck -check-prefix=SO %s
# EXE: Relocations [
diff --git a/lld/test/elf/Mips/hilo16-1.test b/lld/test/elf/Mips/hilo16-1.test
index d51e641c25a..b284140f748 100644
--- a/lld/test/elf/Mips/hilo16-1.test
+++ b/lld/test/elf/Mips/hilo16-1.test
@@ -3,7 +3,7 @@
# Check handling multiple HI16 relocation followed by a single LO16 relocation.
# RUN: llvm-mc -arch=mipsel -filetype=obj -o=%t.o %s
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -d -t %t.exe | FileCheck %s
# CHECK: Disassembly of section .text:
diff --git a/lld/test/elf/Mips/hilo16-2.test b/lld/test/elf/Mips/hilo16-2.test
index 6d2ee78ea2e..e47b9003a8d 100644
--- a/lld/test/elf/Mips/hilo16-2.test
+++ b/lld/test/elf/Mips/hilo16-2.test
@@ -7,7 +7,7 @@
# where AHL = (AHI << 16) + ALO
# RUN: llvm-mc -arch=mipsel -filetype=obj -o=%t.o %s
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -d %t.exe | FileCheck %s
# CHECK: Disassembly of section .text:
diff --git a/lld/test/elf/Mips/hilo16-3-overflow.test b/lld/test/elf/Mips/hilo16-3-overflow.test
index 0c5523374b8..94fc90b3be5 100644
--- a/lld/test/elf/Mips/hilo16-3-overflow.test
+++ b/lld/test/elf/Mips/hilo16-3-overflow.test
@@ -1,7 +1,7 @@
# Check R_MIPS_HI16 relocation overflow handling.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -shared -o %t.so %t.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o 2>&1 \
# RUN: | FileCheck %s
# CHECK: Relocation out of range in file {{.*}} reference from T0+0 to _gp_disp+2147483648 of type 5 (R_MIPS_HI16)
diff --git a/lld/test/elf/Mips/hilo16-3.test b/lld/test/elf/Mips/hilo16-3.test
index 002c474b0ea..17873c0a629 100644
--- a/lld/test/elf/Mips/hilo16-3.test
+++ b/lld/test/elf/Mips/hilo16-3.test
@@ -5,7 +5,7 @@
# where AHL = (AHI << 16) + ALO
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o
# RUN: llvm-objdump -s -t %t.so | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/hilo16-4.test b/lld/test/elf/Mips/hilo16-4.test
index 8a13f7b131f..2db17344e30 100644
--- a/lld/test/elf/Mips/hilo16-4.test
+++ b/lld/test/elf/Mips/hilo16-4.test
@@ -2,7 +2,7 @@
# Check pairing of R_MIPS_HI16 and R_MIPS_LO16 relocations.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target mipsel -e glob1 -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target mipsel -e glob1 -o %t-exe %t-obj
# RUN: llvm-objdump -t -disassemble %t-exe | FileCheck %s
# CHECK: Disassembly of section .text:
diff --git a/lld/test/elf/Mips/hilo16-5.test b/lld/test/elf/Mips/hilo16-5.test
index 91aca8b1c36..597425e8ba7 100644
--- a/lld/test/elf/Mips/hilo16-5.test
+++ b/lld/test/elf/Mips/hilo16-5.test
@@ -2,9 +2,9 @@
# there is orphaned R_MIPS_HI16 relocation.
# RUN: yaml2obj -format=elf -o %t-so.o -docnum 1 %s
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -o %t-o.o -docnum 2 %s
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so 2>&1 \
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so 2>&1 \
# RUN: | FileCheck -check-prefix=DIAG %s
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=DATA %s
diff --git a/lld/test/elf/Mips/hilo16-8-micro.test b/lld/test/elf/Mips/hilo16-8-micro.test
index f4dd5eb5457..ef8ac782341 100644
--- a/lld/test/elf/Mips/hilo16-8-micro.test
+++ b/lld/test/elf/Mips/hilo16-8-micro.test
@@ -4,7 +4,7 @@
# relocations for a regular symbol.
# RUN: llvm-mc -arch=mipsel -filetype=obj -mattr=micromips -o=%t.o %s
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -d -mattr=micromips %t.exe | FileCheck %s
# CHECK: Disassembly of section .text:
diff --git a/lld/test/elf/Mips/hilo16-9-micro.test b/lld/test/elf/Mips/hilo16-9-micro.test
index 5c3e1496e52..293e35f36cd 100644
--- a/lld/test/elf/Mips/hilo16-9-micro.test
+++ b/lld/test/elf/Mips/hilo16-9-micro.test
@@ -2,7 +2,7 @@
# relocations for the _gp_disp symbol.
#
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o
# RUN: llvm-objdump -s -t %t.so | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/initfini-micro.test b/lld/test/elf/Mips/initfini-micro.test
index ba30e89ade2..ca2708f1bb2 100644
--- a/lld/test/elf/Mips/initfini-micro.test
+++ b/lld/test/elf/Mips/initfini-micro.test
@@ -2,7 +2,7 @@
# use adjusted values with set the last bit.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o
# RUN: llvm-readobj -symbols -dynamic-table %t.so | FileCheck %s
# CHECK: Name: _init (1)
diff --git a/lld/test/elf/Mips/interpreter-64.test b/lld/test/elf/Mips/interpreter-64.test
index 3ece3e6a467..7cfd0c51a3c 100644
--- a/lld/test/elf/Mips/interpreter-64.test
+++ b/lld/test/elf/Mips/interpreter-64.test
@@ -1,6 +1,6 @@
# Check program interpreter setup.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64el -e main -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips64el -e main -o %t.exe %t.o
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# CHECK: Contents of section .interp:
diff --git a/lld/test/elf/Mips/interpreter-n32.test b/lld/test/elf/Mips/interpreter-n32.test
index 9fc0b601d97..7d17256ba43 100644
--- a/lld/test/elf/Mips/interpreter-n32.test
+++ b/lld/test/elf/Mips/interpreter-n32.test
@@ -1,7 +1,7 @@
# Check program interpreter setup in case of N32 ABI.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -o %t.exe %t.o
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# CHECK: Contents of section .interp:
diff --git a/lld/test/elf/Mips/interpreter.test b/lld/test/elf/Mips/interpreter.test
index 5355f7709fb..4ae17b42df1 100644
--- a/lld/test/elf/Mips/interpreter.test
+++ b/lld/test/elf/Mips/interpreter.test
@@ -1,6 +1,6 @@
# Check program interpreter setup.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e main -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e main -o %t.exe %t.o
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# CHECK: Contents of section .interp:
diff --git a/lld/test/elf/Mips/invalid-reginfo.test b/lld/test/elf/Mips/invalid-reginfo.test
index d56223bf2e0..2856ecc9260 100644
--- a/lld/test/elf/Mips/invalid-reginfo.test
+++ b/lld/test/elf/Mips/invalid-reginfo.test
@@ -1,7 +1,7 @@
# Check that LLD shows an error if .reginfo section has invalid size
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -o %t.exe %t.o 2>&1 | FileCheck %s
+# RUN: not lld -flavor old-gnu -target mipsel -o %t.exe %t.o 2>&1 | FileCheck %s
# CHECK: Invalid size of MIPS_REGINFO section
diff --git a/lld/test/elf/Mips/jalx-align-err.test b/lld/test/elf/Mips/jalx-align-err.test
index 0e6d42ea32c..8fc5310bbad 100644
--- a/lld/test/elf/Mips/jalx-align-err.test
+++ b/lld/test/elf/Mips/jalx-align-err.test
@@ -1,7 +1,7 @@
# Check that LLD shows an error if jalx target value is not word-aligned.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: not lld -flavor gnu -target mipsel -e T0 -o %t-exe %t-obj 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -e T0 -o %t-exe %t-obj 2>&1 \
# RUN: | FileCheck %s
# CHECK: The jalx target 0x{{[0-9a-f]+}} is not word-aligned
diff --git a/lld/test/elf/Mips/jalx-jalr.test b/lld/test/elf/Mips/jalx-jalr.test
index 9b5eff5a6d9..d02e9d7c2ba 100644
--- a/lld/test/elf/Mips/jalx-jalr.test
+++ b/lld/test/elf/Mips/jalx-jalr.test
@@ -1,7 +1,7 @@
# Check that R_MIPS_JALR relocation does not affect code in case of cross jump.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -o %t.exe %t.o
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/jalx.test b/lld/test/elf/Mips/jalx.test
index 5fc53e4da0e..60d6ea71193 100644
--- a/lld/test/elf/Mips/jalx.test
+++ b/lld/test/elf/Mips/jalx.test
@@ -1,7 +1,7 @@
# Check jal => jalx conversion in case of mixed microMIPS and regular code.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T1 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T1 -o %t.exe %t.o
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=RAW %s
# RUN: llvm-nm %t.exe | FileCheck -check-prefix=SYM %s
diff --git a/lld/test/elf/Mips/jump-fix-err.test b/lld/test/elf/Mips/jump-fix-err.test
index 98117993839..0e5a5298a73 100644
--- a/lld/test/elf/Mips/jump-fix-err.test
+++ b/lld/test/elf/Mips/jump-fix-err.test
@@ -2,7 +2,7 @@
# of replacing an unknown unstruction by jalx.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: not lld -flavor gnu -target mipsel -o %t-exe %t-obj 2>&1 | FileCheck %s
+# RUN: not lld -flavor old-gnu -target mipsel -o %t-exe %t-obj 2>&1 | FileCheck %s
# CHECK: Unsupported jump opcode (0x0) for ISA modes cross call
diff --git a/lld/test/elf/Mips/la25-stub-be.test b/lld/test/elf/Mips/la25-stub-be.test
index b4c75985ad0..9527e7a8064 100644
--- a/lld/test/elf/Mips/la25-stub-be.test
+++ b/lld/test/elf/Mips/la25-stub-be.test
@@ -5,7 +5,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-npic.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-pic.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-main.o
-# RUN: lld -flavor gnu -target mips -o %t.exe %t-npic.o %t-pic.o %t-main.o
+# RUN: lld -flavor old-gnu -target mips -o %t.exe %t-npic.o %t-pic.o %t-main.o
# RUN: llvm-objdump -disassemble %t.exe | FileCheck %s
diff --git a/lld/test/elf/Mips/la25-stub-micro-be.test b/lld/test/elf/Mips/la25-stub-micro-be.test
index fffd6dd9844..0bea3e6ac8b 100644
--- a/lld/test/elf/Mips/la25-stub-micro-be.test
+++ b/lld/test/elf/Mips/la25-stub-micro-be.test
@@ -5,7 +5,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-npic.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-pic.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-main.o
-# RUN: lld -flavor gnu -target mips -o %t.exe %t-npic.o %t-pic.o %t-main.o
+# RUN: lld -flavor old-gnu -target mips -o %t.exe %t-npic.o %t-pic.o %t-main.o
# RUN: llvm-objdump -disassemble -mattr=micromips %t.exe | FileCheck %s
diff --git a/lld/test/elf/Mips/la25-stub-micro.test b/lld/test/elf/Mips/la25-stub-micro.test
index adafad3d260..c01da590882 100644
--- a/lld/test/elf/Mips/la25-stub-micro.test
+++ b/lld/test/elf/Mips/la25-stub-micro.test
@@ -5,7 +5,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-npic.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-pic.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-main.o
-# RUN: lld -flavor gnu -target mipsel -e glob -o %t.exe \
+# RUN: lld -flavor old-gnu -target mipsel -e glob -o %t.exe \
# RUN: %t-npic.o %t-pic.o %t-main.o
# RUN: llvm-nm %t.exe | FileCheck -check-prefix=SYM %s
diff --git a/lld/test/elf/Mips/la25-stub-npic-01.test b/lld/test/elf/Mips/la25-stub-npic-01.test
index ef56772d696..9ff6af06cb2 100644
--- a/lld/test/elf/Mips/la25-stub-npic-01.test
+++ b/lld/test/elf/Mips/la25-stub-npic-01.test
@@ -4,7 +4,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-pic.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-reg.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-micro.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe \
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe \
# RUN: %t-reg.o %t-micro.o %t-pic.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
diff --git a/lld/test/elf/Mips/la25-stub-npic-02.test b/lld/test/elf/Mips/la25-stub-npic-02.test
index 5e0e4da30e5..4f2eb14d8c9 100644
--- a/lld/test/elf/Mips/la25-stub-npic-02.test
+++ b/lld/test/elf/Mips/la25-stub-npic-02.test
@@ -4,7 +4,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t1.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t1.o %t2.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t1.o %t2.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
diff --git a/lld/test/elf/Mips/la25-stub-npic-shared.test b/lld/test/elf/Mips/la25-stub-npic-shared.test
index 04e4bfb9ea8..72bac30f86a 100644
--- a/lld/test/elf/Mips/la25-stub-npic-shared.test
+++ b/lld/test/elf/Mips/la25-stub-npic-shared.test
@@ -4,8 +4,8 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-pic.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-reg.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-micro.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-pic.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-reg.o %t-micro.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-pic.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-reg.o %t-micro.o %t.so
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
diff --git a/lld/test/elf/Mips/la25-stub-pic.test b/lld/test/elf/Mips/la25-stub-pic.test
index b96f56f2218..8db88404aae 100644
--- a/lld/test/elf/Mips/la25-stub-pic.test
+++ b/lld/test/elf/Mips/la25-stub-pic.test
@@ -4,7 +4,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-reg.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-micro.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o %t-reg.o %t-micro.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o %t-reg.o %t-micro.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
diff --git a/lld/test/elf/Mips/la25-stub.test b/lld/test/elf/Mips/la25-stub.test
index 4c56c55f75b..4df7f85e8c8 100644
--- a/lld/test/elf/Mips/la25-stub.test
+++ b/lld/test/elf/Mips/la25-stub.test
@@ -4,7 +4,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-npic.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-pic.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-main.o
-# RUN: lld -flavor gnu -target mipsel -e glob -o %t.exe \
+# RUN: lld -flavor old-gnu -target mipsel -e glob -o %t.exe \
# RUN: %t-npic.o %t-pic.o %t-main.o
# RUN: llvm-readobj -t %t.exe | FileCheck -check-prefix=SYM %s
diff --git a/lld/test/elf/Mips/mips-options-01.test b/lld/test/elf/Mips/mips-options-01.test
index 059b3d617ae..8f2e63ca3b5 100644
--- a/lld/test/elf/Mips/mips-options-01.test
+++ b/lld/test/elf/Mips/mips-options-01.test
@@ -2,7 +2,7 @@
# object file does not contain such section.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t.o
# RUN: llvm-readobj -s -dynamic-table %t.so | FileCheck %s
# CHECK: Sections [
diff --git a/lld/test/elf/Mips/mips-options-02.test b/lld/test/elf/Mips/mips-options-02.test
index bb01952dccc..a5f19e55735 100644
--- a/lld/test/elf/Mips/mips-options-02.test
+++ b/lld/test/elf/Mips/mips-options-02.test
@@ -2,7 +2,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t1.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t1.o %t2.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t1.o %t2.o
# RUN: llvm-readobj -s -dynamic-table %t.so | FileCheck -check-prefix=SEC %s
# RUN: llvm-objdump -s -t %t.so | FileCheck -check-prefix=RAW %s
# RUN: llvm-readobj -program-headers %t.so | FileCheck -check-prefix=PHDR %s
diff --git a/lld/test/elf/Mips/mips-options-03.test b/lld/test/elf/Mips/mips-options-03.test
index b4a0d265c8f..a0dea5709b6 100644
--- a/lld/test/elf/Mips/mips-options-03.test
+++ b/lld/test/elf/Mips/mips-options-03.test
@@ -1,7 +1,7 @@
# Check handling a zero-filled input .MIPS.options section.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t.o
# RUN: llvm-objdump -s -t %t.so | FileCheck %s
# CHECK: Contents of section .MIPS.options:
diff --git a/lld/test/elf/Mips/mips-options-04.test b/lld/test/elf/Mips/mips-options-04.test
index db166186623..5df94aae925 100644
--- a/lld/test/elf/Mips/mips-options-04.test
+++ b/lld/test/elf/Mips/mips-options-04.test
@@ -2,9 +2,9 @@
# output .MIPS.options section content.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t.so.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t.so.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t.so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t.exe.o
-# RUN: lld -flavor gnu -target mips64el -e T0 -o %t.exe %t.so %t.exe.o
+# RUN: lld -flavor old-gnu -target mips64el -e T0 -o %t.exe %t.so %t.exe.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .MIPS.options:
diff --git a/lld/test/elf/Mips/mips-options-05.test b/lld/test/elf/Mips/mips-options-05.test
index 318d33910b9..f7e9728b3cf 100644
--- a/lld/test/elf/Mips/mips-options-05.test
+++ b/lld/test/elf/Mips/mips-options-05.test
@@ -6,7 +6,7 @@
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.o
# RUN: llvm-ar q %T/liboptions.a %t1.o %t2.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t3.o
-# RUN: lld -flavor gnu -target mips64el -e T0 -o %t.exe %t3.o -L%T -loptions
+# RUN: lld -flavor old-gnu -target mips64el -e T0 -o %t.exe %t3.o -L%T -loptions
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .MIPS.options:
diff --git a/lld/test/elf/Mips/mips-options-gp0.test b/lld/test/elf/Mips/mips-options-gp0.test
index 905b1847e65..73e578347f2 100644
--- a/lld/test/elf/Mips/mips-options-gp0.test
+++ b/lld/test/elf/Mips/mips-options-gp0.test
@@ -1,7 +1,7 @@
# Check reading GP0 value from .MIPS.options section
#
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64el -e G1 -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mips64el -e G1 -shared -o %t.so %t.o
# RUN: llvm-readobj -symbols %t.so | FileCheck -check-prefix=SYM %s
# RUN: llvm-objdump -s %t.so | FileCheck -check-prefix=SEC %s
diff --git a/lld/test/elf/Mips/n32-rela-chain.test b/lld/test/elf/Mips/n32-rela-chain.test
index fdea408f382..9569eb7c585 100644
--- a/lld/test/elf/Mips/n32-rela-chain.test
+++ b/lld/test/elf/Mips/n32-rela-chain.test
@@ -2,7 +2,7 @@
# and 64-bit MIPS ABIs.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/n64-rel-chain.test b/lld/test/elf/Mips/n64-rel-chain.test
index 390225384de..3797c432170 100644
--- a/lld/test/elf/Mips/n64-rel-chain.test
+++ b/lld/test/elf/Mips/n64-rel-chain.test
@@ -1,9 +1,9 @@
# Check handling MIPS N64 ABI relocation "chains".
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mips64el -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mips64el -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -s -t -dt -mips-plt-got %t.exe | \
# RUN: FileCheck -check-prefix=SYM %s
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=RAW %s
diff --git a/lld/test/elf/Mips/n64-rel-shift.test b/lld/test/elf/Mips/n64-rel-shift.test
index f2512dd99b0..31a780beb99 100644
--- a/lld/test/elf/Mips/n64-rel-shift.test
+++ b/lld/test/elf/Mips/n64-rel-shift.test
@@ -2,7 +2,7 @@
# each relocations in N64 relocation chain.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t.o
# RUN: llvm-objdump -s %t.so | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/opt-emulation.test b/lld/test/elf/Mips/opt-emulation.test
index 32315c44b31..a48b49bfaa0 100644
--- a/lld/test/elf/Mips/opt-emulation.test
+++ b/lld/test/elf/Mips/opt-emulation.test
@@ -1,9 +1,9 @@
# Check MIPS specific arguments of the -m command line option.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target mipsel -m elf32ltsmip -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target mipsel -m elf32ltsmip -o %t-exe %t-obj
# RUN: llvm-readobj -file-headers %t-exe | FileCheck -check-prefix=LE-O32 %s
-# RUN: lld -flavor gnu -target mipsel -melf32ltsmip -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target mipsel -melf32ltsmip -o %t-exe %t-obj
# RUN: llvm-readobj -file-headers %t-exe | FileCheck -check-prefix=LE-O32 %s
# LE-O32: Class: 32-bit (0x1)
diff --git a/lld/test/elf/Mips/pc23-range.test b/lld/test/elf/Mips/pc23-range.test
index ffad185234e..89e9ab7bb73 100644
--- a/lld/test/elf/Mips/pc23-range.test
+++ b/lld/test/elf/Mips/pc23-range.test
@@ -1,7 +1,7 @@
# Check that LLD shows an error if ADDIUPC immediate is out of range.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -o %t.exe %t.o 2>&1 | FileCheck %s
+# RUN: not lld -flavor old-gnu -target mipsel -o %t.exe %t.o 2>&1 | FileCheck %s
# CHECK: Relocation out of range in file {{.*}}: reference from __start+4 to T0+4 of type 173 (R_MICROMIPS_PC23_S2)
diff --git a/lld/test/elf/Mips/plt-entry-mixed-1.test b/lld/test/elf/Mips/plt-entry-mixed-1.test
index 855248d68f5..e05eec4c810 100644
--- a/lld/test/elf/Mips/plt-entry-mixed-1.test
+++ b/lld/test/elf/Mips/plt-entry-mixed-1.test
@@ -8,11 +8,11 @@
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t.so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t.o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o.o %t.so
# RUN: llvm-objdump -d %t.exe | FileCheck %s
# CHECK: Disassembly of section .plt:
diff --git a/lld/test/elf/Mips/plt-entry-mixed-2.test b/lld/test/elf/Mips/plt-entry-mixed-2.test
index e5b7e50ab71..299aa5ce065 100644
--- a/lld/test/elf/Mips/plt-entry-mixed-2.test
+++ b/lld/test/elf/Mips/plt-entry-mixed-2.test
@@ -7,11 +7,11 @@
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t.so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t.o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o.o %t.so
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# FIXME (simon): Check the disassembler output when llvm-objdump starts
diff --git a/lld/test/elf/Mips/plt-entry-mixed-3.test b/lld/test/elf/Mips/plt-entry-mixed-3.test
index c61991b4b13..c946ecc82d2 100644
--- a/lld/test/elf/Mips/plt-entry-mixed-3.test
+++ b/lld/test/elf/Mips/plt-entry-mixed-3.test
@@ -8,11 +8,11 @@
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t.so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t.o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o.o %t.so
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# FIXME (simon): Check the disassembler output when llvm-objdump starts
diff --git a/lld/test/elf/Mips/plt-entry-mixed-4.test b/lld/test/elf/Mips/plt-entry-mixed-4.test
index 9b2a2e5ddcd..ba8b04866b9 100644
--- a/lld/test/elf/Mips/plt-entry-mixed-4.test
+++ b/lld/test/elf/Mips/plt-entry-mixed-4.test
@@ -7,11 +7,11 @@
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t.so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t.o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o.o %t.so
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# FIXME (simon): Check the disassembler output when llvm-objdump starts
diff --git a/lld/test/elf/Mips/plt-entry-r6-be.test b/lld/test/elf/Mips/plt-entry-r6-be.test
index 8e512a81739..3e15ece894e 100644
--- a/lld/test/elf/Mips/plt-entry-r6-be.test
+++ b/lld/test/elf/Mips/plt-entry-r6-be.test
@@ -4,11 +4,11 @@
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mips -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mips -shared -o %t.so %t-so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mips -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mips -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-objdump -d %t.exe | FileCheck %s
# CHECK: Disassembly of section .plt:
diff --git a/lld/test/elf/Mips/plt-entry-r6.test b/lld/test/elf/Mips/plt-entry-r6.test
index 39cb46a3b10..0d8bbf494af 100644
--- a/lld/test/elf/Mips/plt-entry-r6.test
+++ b/lld/test/elf/Mips/plt-entry-r6.test
@@ -4,11 +4,11 @@
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-objdump -d %t.exe | FileCheck %s
# CHECK: Disassembly of section .plt:
diff --git a/lld/test/elf/Mips/plt-header-be.test b/lld/test/elf/Mips/plt-header-be.test
index b006265e9dc..e453e44f76d 100644
--- a/lld/test/elf/Mips/plt-header-be.test
+++ b/lld/test/elf/Mips/plt-header-be.test
@@ -4,11 +4,11 @@
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mips -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mips -shared -o %t.so %t-so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mips -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mips -o %t.exe %t-o.o %t.so
# RUN: llvm-objdump -section-headers -disassemble %t.exe | FileCheck %s
# CHECK: Disassembly of section .plt:
diff --git a/lld/test/elf/Mips/plt-header-micro-be.test b/lld/test/elf/Mips/plt-header-micro-be.test
index 14140e11da0..e9aa51ef85e 100644
--- a/lld/test/elf/Mips/plt-header-micro-be.test
+++ b/lld/test/elf/Mips/plt-header-micro-be.test
@@ -4,9 +4,9 @@
# if all PLT entries use microMIPS big-endian encoding.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t1.o
-# RUN: lld -flavor gnu -target mips -shared -o %t.so %t1.o
+# RUN: lld -flavor old-gnu -target mips -shared -o %t.so %t1.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.o
-# RUN: lld -flavor gnu -target mips -o %t.exe %t2.o %t.so
+# RUN: lld -flavor old-gnu -target mips -o %t.exe %t2.o %t.so
# RUN: llvm-objdump -section-headers -d -mattr=micromips %t.exe | FileCheck %s
# CHECK: Disassembly of section .plt:
diff --git a/lld/test/elf/Mips/plt-header-micro.test b/lld/test/elf/Mips/plt-header-micro.test
index ce042741cd3..743c4c33218 100644
--- a/lld/test/elf/Mips/plt-header-micro.test
+++ b/lld/test/elf/Mips/plt-header-micro.test
@@ -5,11 +5,11 @@
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e glob -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e glob -o %t.exe %t-o.o %t.so
# RUN: llvm-objdump -d -mattr=micromips %t.exe | FileCheck -check-prefix=DIS %s
# RUN: llvm-objdump -section-headers %t.exe | FileCheck -check-prefix=EXE %s
diff --git a/lld/test/elf/Mips/plt-header-mixed.test b/lld/test/elf/Mips/plt-header-mixed.test
index 77b7275ec24..456f5a91c98 100644
--- a/lld/test/elf/Mips/plt-header-mixed.test
+++ b/lld/test/elf/Mips/plt-header-mixed.test
@@ -6,11 +6,11 @@
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e globR -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e globR -o %t.exe %t-o.o %t.so
# RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=DIS %s
# RUN: llvm-objdump -section-headers %t.exe | FileCheck -check-prefix=EXE %s
diff --git a/lld/test/elf/Mips/plt-header.test b/lld/test/elf/Mips/plt-header.test
index 51f09113704..6d303254d16 100644
--- a/lld/test/elf/Mips/plt-header.test
+++ b/lld/test/elf/Mips/plt-header.test
@@ -4,11 +4,11 @@
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e glob -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e glob -o %t.exe %t-o.o %t.so
# RUN: llvm-objdump -section-headers -disassemble %t.exe | \
# RUN: FileCheck -check-prefix=EXE %s
diff --git a/lld/test/elf/Mips/r26-1-micro.test b/lld/test/elf/Mips/r26-1-micro.test
index 629754febc7..c59b5aa61a5 100644
--- a/lld/test/elf/Mips/r26-1-micro.test
+++ b/lld/test/elf/Mips/r26-1-micro.test
@@ -4,13 +4,13 @@
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
# RUN: llvm-readobj -relocations %t-o.o | \
# RUN: FileCheck -check-prefix=OBJ-REL %s
-# RUN: lld -flavor gnu -target mipsel -e glob -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e glob -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -relocations %t.exe | FileCheck -check-prefix=EXE-REL %s
# RUN: llvm-objdump -section-headers %t.exe | FileCheck -check-prefix=EXE %s
# RUN: llvm-objdump -s -d -mattr=micromips %t.exe | \
diff --git a/lld/test/elf/Mips/r26-1.test b/lld/test/elf/Mips/r26-1.test
index abc0a7ce5a8..41c58deceed 100644
--- a/lld/test/elf/Mips/r26-1.test
+++ b/lld/test/elf/Mips/r26-1.test
@@ -4,13 +4,13 @@
# Build shared library
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# Build executable
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
# RUN: llvm-readobj -relocations %t-o.o | \
# RUN: FileCheck -check-prefix=OBJ-REL %s
-# RUN: lld -flavor gnu -target mipsel -e glob -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e glob -o %t.exe %t-o.o %t.so
# RUN: llvm-objdump -section-headers -disassemble %t.exe | \
# RUN: FileCheck -check-prefix=EXE %s
# RUN: llvm-readobj -relocations %t.exe | FileCheck -check-prefix=EXE-REL %s
diff --git a/lld/test/elf/Mips/r26-2-micro.test b/lld/test/elf/Mips/r26-2-micro.test
index 05e6250577b..7d4f86e57f7 100644
--- a/lld/test/elf/Mips/r26-2-micro.test
+++ b/lld/test/elf/Mips/r26-2-micro.test
@@ -2,7 +2,7 @@
# Check reading addendum for R_MICROMIPS_26_S1 relocation.
# RUN: llvm-mc -arch=mipsel -filetype=obj -mattr=micromips -o=%t.o %s
-# RUN: lld -flavor gnu -target mipsel -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -o %t.exe %t.o
# RUN: llvm-objdump -d -mattr=micromips %t.exe | FileCheck %s
# CHECK: Disassembly of section .text:
diff --git a/lld/test/elf/Mips/r26-2.test b/lld/test/elf/Mips/r26-2.test
index 02762e32173..b9db959d3ea 100644
--- a/lld/test/elf/Mips/r26-2.test
+++ b/lld/test/elf/Mips/r26-2.test
@@ -2,7 +2,7 @@
# Check reading addendum for R_MIPS_26 relocation.
# RUN: llvm-mc -arch=mipsel -filetype=obj -o=%t.o %s
-# RUN: lld -flavor gnu -target mipsel -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -o %t.exe %t.o
# RUN: llvm-objdump -d %t.exe | FileCheck %s
# CHECK: Disassembly of section .text:
diff --git a/lld/test/elf/Mips/reginfo-01.test b/lld/test/elf/Mips/reginfo-01.test
index 5076ef83470..ee7cd6a5fce 100644
--- a/lld/test/elf/Mips/reginfo-01.test
+++ b/lld/test/elf/Mips/reginfo-01.test
@@ -2,7 +2,7 @@
# object file does not contain such section.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o
# RUN: llvm-readobj -s %t.so | FileCheck %s
# CHECK-NOT: Name: .reginfo
diff --git a/lld/test/elf/Mips/reginfo-02.test b/lld/test/elf/Mips/reginfo-02.test
index e0478f26874..41eac01a11b 100644
--- a/lld/test/elf/Mips/reginfo-02.test
+++ b/lld/test/elf/Mips/reginfo-02.test
@@ -2,7 +2,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t1.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t1.o %t2.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t1.o %t2.o
# RUN: llvm-readobj -program-headers -s -t -mips-reginfo %t.so | FileCheck %s
# CHECK: Index: 1
diff --git a/lld/test/elf/Mips/reginfo-03.test b/lld/test/elf/Mips/reginfo-03.test
index 9a92b7362a0..edee1440d35 100644
--- a/lld/test/elf/Mips/reginfo-03.test
+++ b/lld/test/elf/Mips/reginfo-03.test
@@ -1,7 +1,7 @@
# Check handling a zero-filled input .reginfo section.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o
# RUN: llvm-readobj -t -mips-reginfo %t.so | FileCheck %s
# CHECK: Name: _gp
diff --git a/lld/test/elf/Mips/reginfo-04.test b/lld/test/elf/Mips/reginfo-04.test
index 55f216a1355..bad34e5003f 100644
--- a/lld/test/elf/Mips/reginfo-04.test
+++ b/lld/test/elf/Mips/reginfo-04.test
@@ -2,9 +2,9 @@
# output .reginfo section content.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t.so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t.exe.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.so %t.exe.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.so %t.exe.o
# RUN: llvm-readobj -t -mips-reginfo %t.exe | FileCheck %s
# CHECK: Name: _gp
diff --git a/lld/test/elf/Mips/reginfo-05.test b/lld/test/elf/Mips/reginfo-05.test
index d069120ad2c..9de9fa62149 100644
--- a/lld/test/elf/Mips/reginfo-05.test
+++ b/lld/test/elf/Mips/reginfo-05.test
@@ -6,7 +6,7 @@
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.o
# RUN: llvm-ar q %T/libreginfo.a %t1.o %t2.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t3.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t3.o -L%T -lreginfo
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t3.o -L%T -lreginfo
# RUN: llvm-readobj -t -mips-reginfo %t.exe | FileCheck %s
# CHECK: Name: _gp
diff --git a/lld/test/elf/Mips/rel-16-overflow.test b/lld/test/elf/Mips/rel-16-overflow.test
index 7d5cb940444..e2a73f69336 100644
--- a/lld/test/elf/Mips/rel-16-overflow.test
+++ b/lld/test/elf/Mips/rel-16-overflow.test
@@ -1,7 +1,7 @@
# Check R_MIPS_16 relocation overflow handling.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
# RUN: | FileCheck %s
# CHECK: Relocation out of range in file {{.*}} reference from T0+0 to T1+32767 of type 1 (R_MIPS_16)
diff --git a/lld/test/elf/Mips/rel-16.test b/lld/test/elf/Mips/rel-16.test
index 93d6b7dfa76..24961e8b78f 100644
--- a/lld/test/elf/Mips/rel-16.test
+++ b/lld/test/elf/Mips/rel-16.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_16 relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/rel-32-be.test b/lld/test/elf/Mips/rel-32-be.test
index be48291af40..3eac8a2848f 100644
--- a/lld/test/elf/Mips/rel-32-be.test
+++ b/lld/test/elf/Mips/rel-32-be.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_32 relocation in the big-endian case.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .data:
diff --git a/lld/test/elf/Mips/rel-32.test b/lld/test/elf/Mips/rel-32.test
index beefde59b7b..f028d79c868 100644
--- a/lld/test/elf/Mips/rel-32.test
+++ b/lld/test/elf/Mips/rel-32.test
@@ -1,6 +1,6 @@
# Check handling of R_MIPS_32 relocation.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target mipsel -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target mipsel -o %t-exe %t-obj
# RUN: llvm-objdump -s -t %t-exe | FileCheck %s
# CHECK: Contents of section .data:
diff --git a/lld/test/elf/Mips/rel-64.test b/lld/test/elf/Mips/rel-64.test
index e05b7568703..c97ff991c0c 100644
--- a/lld/test/elf/Mips/rel-64.test
+++ b/lld/test/elf/Mips/rel-64.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_64 relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64el -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips64el -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .data:
diff --git a/lld/test/elf/Mips/rel-call-hilo-01.test b/lld/test/elf/Mips/rel-call-hilo-01.test
index 6ba02f12806..88f2e337d92 100644
--- a/lld/test/elf/Mips/rel-call-hilo-01.test
+++ b/lld/test/elf/Mips/rel-call-hilo-01.test
@@ -1,9 +1,9 @@
# Check handling of R_MIPS_CALL_HI16 / R_MIPS_CALL_LO16 relocations.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t1.so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t1.so %t1.so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t1.so %t1.so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t2.so %t2.so.o %t1.so
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t2.so %t2.so.o %t1.so
# RUN: llvm-objdump -s -t %t2.so | FileCheck -check-prefix=RAW %s
# RUN: llvm-readobj -mips-plt-got %t2.so | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-call-hilo-micro.test b/lld/test/elf/Mips/rel-call-hilo-micro.test
index b7beda59ddb..0df68def92b 100644
--- a/lld/test/elf/Mips/rel-call-hilo-micro.test
+++ b/lld/test/elf/Mips/rel-call-hilo-micro.test
@@ -1,9 +1,9 @@
# Check handling of R_MICROMIPS_CALL_HI16 / R_MICROMIPS_CALL_LO16 relocations.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t1.so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t1.so %t1.so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t1.so %t1.so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t2.so %t2.so.o %t1.so
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t2.so %t2.so.o %t1.so
# RUN: llvm-objdump -s -t %t2.so | FileCheck -check-prefix=RAW %s
# RUN: llvm-readobj -mips-plt-got %t2.so | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-copy-micro.test b/lld/test/elf/Mips/rel-copy-micro.test
index 6d924b1eb7e..ba47c84a2c5 100644
--- a/lld/test/elf/Mips/rel-copy-micro.test
+++ b/lld/test/elf/Mips/rel-copy-micro.test
@@ -2,11 +2,11 @@
# when linking non-shared executable file.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so1.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t1.so %t-so1.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t1.so %t-so1.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-so2.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t2.so %t-so2.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t2.so %t-so2.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t1.so %t2.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t1.so %t2.so
# RUN: llvm-readobj -dt -r -dynamic-table %t.exe | FileCheck %s
# CHECK: Relocations [
diff --git a/lld/test/elf/Mips/rel-copy-pc.test b/lld/test/elf/Mips/rel-copy-pc.test
index cfd59f52b97..cf723f53719 100644
--- a/lld/test/elf/Mips/rel-copy-pc.test
+++ b/lld/test/elf/Mips/rel-copy-pc.test
@@ -2,9 +2,9 @@
# relocations when linking non-shared executable file.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -dt -r -dynamic-table %t.exe | FileCheck %s
# CHECK: Relocations [
diff --git a/lld/test/elf/Mips/rel-copy.test b/lld/test/elf/Mips/rel-copy.test
index e38b12552d9..751034dcd72 100644
--- a/lld/test/elf/Mips/rel-copy.test
+++ b/lld/test/elf/Mips/rel-copy.test
@@ -2,11 +2,11 @@
# when linking non-shared executable file.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so1.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t1.so %t-so1.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t1.so %t-so1.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-so2.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t2.so %t-so2.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t2.so %t-so2.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t1.so %t2.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t1.so %t2.so
# RUN: llvm-readobj -dt -r -dynamic-table %t.exe | FileCheck %s
# CHECK: Relocations [
diff --git a/lld/test/elf/Mips/rel-dynamic-01-micro.test b/lld/test/elf/Mips/rel-dynamic-01-micro.test
index 00243c3f1aa..56dd7dfdecc 100644
--- a/lld/test/elf/Mips/rel-dynamic-01-micro.test
+++ b/lld/test/elf/Mips/rel-dynamic-01-micro.test
@@ -10,9 +10,9 @@
# a pointer equality.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-objdump -d -mattr=micromips %t.exe | FileCheck -check-prefix=DIS %s
# RUN: llvm-readobj -dt -r %t.exe | FileCheck -check-prefix=PLT-SYM %s
diff --git a/lld/test/elf/Mips/rel-dynamic-01.test b/lld/test/elf/Mips/rel-dynamic-01.test
index b6d9957698b..e24449eeeb5 100644
--- a/lld/test/elf/Mips/rel-dynamic-01.test
+++ b/lld/test/elf/Mips/rel-dynamic-01.test
@@ -10,9 +10,9 @@
# a pointer equality.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-objdump -disassemble %t.exe | FileCheck -check-prefix=PLT %s
# RUN: llvm-readobj -dt -r %t.exe | FileCheck -check-prefix=PLT-SYM %s
# RUN: llvm-readobj -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-dynamic-02.test b/lld/test/elf/Mips/rel-dynamic-02.test
index 5fe37cc8a78..24b7c624c6a 100644
--- a/lld/test/elf/Mips/rel-dynamic-02.test
+++ b/lld/test/elf/Mips/rel-dynamic-02.test
@@ -6,7 +6,7 @@
# b) There should be no PLT entries.
#
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared --noinhibit-exec -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared --noinhibit-exec -o %t.so %t.o
# RUN: llvm-readobj -dt -r -s %t.so | FileCheck %s
# CHECK: Sections [
diff --git a/lld/test/elf/Mips/rel-dynamic-03-micro.test b/lld/test/elf/Mips/rel-dynamic-03-micro.test
index 5de2cdcdc13..891649d8cdb 100644
--- a/lld/test/elf/Mips/rel-dynamic-03-micro.test
+++ b/lld/test/elf/Mips/rel-dynamic-03-micro.test
@@ -12,9 +12,9 @@
# a pointer equality.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-objdump -d -mattr=micromips %t.exe | FileCheck -check-prefix=DIS %s
# RUN: llvm-readobj -dt -r %t.exe | FileCheck -check-prefix=PLT-SYM %s
diff --git a/lld/test/elf/Mips/rel-dynamic-03.test b/lld/test/elf/Mips/rel-dynamic-03.test
index e2a5f9d302a..2552473ca80 100644
--- a/lld/test/elf/Mips/rel-dynamic-03.test
+++ b/lld/test/elf/Mips/rel-dynamic-03.test
@@ -12,9 +12,9 @@
# a pointer equality.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-objdump -disassemble %t.exe | FileCheck -check-prefix=PLT %s
# RUN: llvm-readobj -dt -r %t.exe | FileCheck -check-prefix=PLT-SYM %s
diff --git a/lld/test/elf/Mips/rel-dynamic-04-micro.test b/lld/test/elf/Mips/rel-dynamic-04-micro.test
index 4ca93999053..de1131c67f4 100644
--- a/lld/test/elf/Mips/rel-dynamic-04-micro.test
+++ b/lld/test/elf/Mips/rel-dynamic-04-micro.test
@@ -15,9 +15,9 @@
# a pointer equality.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -dt -r -s %t.exe | FileCheck -check-prefix=PLT %s
# RUN: llvm-readobj -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-dynamic-04.test b/lld/test/elf/Mips/rel-dynamic-04.test
index e22d1ad8790..df8c676af33 100644
--- a/lld/test/elf/Mips/rel-dynamic-04.test
+++ b/lld/test/elf/Mips/rel-dynamic-04.test
@@ -13,9 +13,9 @@
# a pointer equality.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -dt -r -s %t.exe | FileCheck -check-prefix=PLT %s
# RUN: llvm-readobj -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-dynamic-05-micro.test b/lld/test/elf/Mips/rel-dynamic-05-micro.test
index d1c87076b59..16c6a9c6aad 100644
--- a/lld/test/elf/Mips/rel-dynamic-05-micro.test
+++ b/lld/test/elf/Mips/rel-dynamic-05-micro.test
@@ -14,9 +14,9 @@
# a pointer equality.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -dt -r -s %t.exe | FileCheck -check-prefix=PLT %s
# PLT: Section {
diff --git a/lld/test/elf/Mips/rel-dynamic-05.test b/lld/test/elf/Mips/rel-dynamic-05.test
index 635a2365c00..8348bc511fb 100644
--- a/lld/test/elf/Mips/rel-dynamic-05.test
+++ b/lld/test/elf/Mips/rel-dynamic-05.test
@@ -12,9 +12,9 @@
# a pointer equality.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -dt -r -s %t.exe | FileCheck -check-prefix=PLT %s
# PLT: Section {
diff --git a/lld/test/elf/Mips/rel-dynamic-06-64.test b/lld/test/elf/Mips/rel-dynamic-06-64.test
index f18850d7fcf..6b0d28993f9 100644
--- a/lld/test/elf/Mips/rel-dynamic-06-64.test
+++ b/lld/test/elf/Mips/rel-dynamic-06-64.test
@@ -7,7 +7,7 @@
# b) Linker creates a single R_MIPS_REL32 relocation.
#
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t.o
# RUN: llvm-readobj -dt -r -s %t.so | FileCheck -check-prefix=SYM %s
# RUN: llvm-readobj -mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-dynamic-06.test b/lld/test/elf/Mips/rel-dynamic-06.test
index dff8d20e3ec..ead7dfb08dd 100644
--- a/lld/test/elf/Mips/rel-dynamic-06.test
+++ b/lld/test/elf/Mips/rel-dynamic-06.test
@@ -7,7 +7,7 @@
# b) Linker creates a single R_MIPS_REL32 relocation.
#
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o
# RUN: llvm-readobj -dt -r -s %t.so | FileCheck -check-prefix=SYM %s
# RUN: llvm-readobj -mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-dynamic-07-64.test b/lld/test/elf/Mips/rel-dynamic-07-64.test
index 5fae9f9f458..823a66d521e 100644
--- a/lld/test/elf/Mips/rel-dynamic-07-64.test
+++ b/lld/test/elf/Mips/rel-dynamic-07-64.test
@@ -5,9 +5,9 @@
# a) Emitting of R_MIPS_REL32 relocations.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t1.so %t-so.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t1.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mips64el -shared --noinhibit-exec \
+# RUN: lld -flavor old-gnu -target mips64el -shared --noinhibit-exec \
# RUN: -o %t2.so %t-o.o %t1.so
# RUN: llvm-readobj -dt -r -sections %t2.so | FileCheck %s
# RUN: llvm-readobj -mips-plt-got %t2.so | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-dynamic-07.test b/lld/test/elf/Mips/rel-dynamic-07.test
index 63474f92b21..41c31c66a5f 100644
--- a/lld/test/elf/Mips/rel-dynamic-07.test
+++ b/lld/test/elf/Mips/rel-dynamic-07.test
@@ -6,9 +6,9 @@
# b) There should be no R_MIPS_REL32 relocations for the _gp_disp symbol.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t1.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t1.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -shared --noinhibit-exec \
+# RUN: lld -flavor old-gnu -target mipsel -shared --noinhibit-exec \
# RUN: -o %t2.so %t-o.o %t1.so
# RUN: llvm-readobj -dt -r -sections %t2.so | FileCheck %s
# RUN: llvm-readobj -mips-plt-got %t2.so | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-dynamic-08-64.test b/lld/test/elf/Mips/rel-dynamic-08-64.test
index f4295a0c5d0..019b8e5161a 100644
--- a/lld/test/elf/Mips/rel-dynamic-08-64.test
+++ b/lld/test/elf/Mips/rel-dynamic-08-64.test
@@ -6,9 +6,9 @@
# a) Emitting of R_MIPS_REL32 relocations.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mips64el -e T0 --noinhibit-exec \
+# RUN: lld -flavor old-gnu -target mips64el -e T0 --noinhibit-exec \
# RUN: -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -dt -r -sections %t.exe | FileCheck %s
# RUN: llvm-readobj -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-dynamic-08-micro.test b/lld/test/elf/Mips/rel-dynamic-08-micro.test
index d60c3d4490c..2d25b504ee2 100644
--- a/lld/test/elf/Mips/rel-dynamic-08-micro.test
+++ b/lld/test/elf/Mips/rel-dynamic-08-micro.test
@@ -6,9 +6,9 @@
# a) Emitting of R_MIPS_REL32 relocations.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 --noinhibit-exec \
+# RUN: lld -flavor old-gnu -target mipsel -e T0 --noinhibit-exec \
# RUN: -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -dt -r -sections %t.exe | FileCheck %s
# RUN: llvm-readobj -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-dynamic-08.test b/lld/test/elf/Mips/rel-dynamic-08.test
index e257c5a9d30..a89e6ecf480 100644
--- a/lld/test/elf/Mips/rel-dynamic-08.test
+++ b/lld/test/elf/Mips/rel-dynamic-08.test
@@ -6,9 +6,9 @@
# a) Emitting of R_MIPS_REL32 relocations.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 --noinhibit-exec \
+# RUN: lld -flavor old-gnu -target mipsel -e T0 --noinhibit-exec \
# RUN: -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -dt -r -sections %t.exe | FileCheck %s
# RUN: llvm-readobj -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-dynamic-09-micro.test b/lld/test/elf/Mips/rel-dynamic-09-micro.test
index 07ffce9eb07..2011ae07964 100644
--- a/lld/test/elf/Mips/rel-dynamic-09-micro.test
+++ b/lld/test/elf/Mips/rel-dynamic-09-micro.test
@@ -6,7 +6,7 @@
# b) There should be no PLT entries.
#
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target mipsel --noinhibit-exec -e T0 -o %t2-exe %t-obj
+# RUN: lld -flavor old-gnu -target mipsel --noinhibit-exec -e T0 -o %t2-exe %t-obj
# RUN: llvm-readobj -dt -r -s %t2-exe | FileCheck -check-prefix=PLT-SYM %s
# PLT-SYM: Sections [
diff --git a/lld/test/elf/Mips/rel-dynamic-09.test b/lld/test/elf/Mips/rel-dynamic-09.test
index 18eeb9dd33d..9b02ec1b570 100644
--- a/lld/test/elf/Mips/rel-dynamic-09.test
+++ b/lld/test/elf/Mips/rel-dynamic-09.test
@@ -6,7 +6,7 @@
# b) There should be no PLT entries.
#
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target mipsel --noinhibit-exec -e T0 -o %t2-exe %t-obj
+# RUN: lld -flavor old-gnu -target mipsel --noinhibit-exec -e T0 -o %t2-exe %t-obj
# RUN: llvm-readobj -dt -r -s %t2-exe | FileCheck -check-prefix=PLT-SYM %s
# PLT-SYM: Sections [
diff --git a/lld/test/elf/Mips/rel-dynamic-10-micro.test b/lld/test/elf/Mips/rel-dynamic-10-micro.test
index 6b3f2af3db3..4600af85c27 100644
--- a/lld/test/elf/Mips/rel-dynamic-10-micro.test
+++ b/lld/test/elf/Mips/rel-dynamic-10-micro.test
@@ -7,7 +7,7 @@
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-o1.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o2.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o1.o %t-o2.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o1.o %t-o2.o
# RUN: llvm-readobj -dt -r -s %t.exe | FileCheck -check-prefix=PLT-SYM %s
# PLT-SYM: Sections [
diff --git a/lld/test/elf/Mips/rel-dynamic-10.test b/lld/test/elf/Mips/rel-dynamic-10.test
index 4df558167fc..68a311df73e 100644
--- a/lld/test/elf/Mips/rel-dynamic-10.test
+++ b/lld/test/elf/Mips/rel-dynamic-10.test
@@ -7,7 +7,7 @@
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-o1.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o2.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o1.o %t-o2.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o1.o %t-o2.o
# RUN: llvm-readobj -dt -r -s %t.exe | FileCheck -check-prefix=PLT-SYM %s
# PLT-SYM: Sections [
diff --git a/lld/test/elf/Mips/rel-dynamic-11.test b/lld/test/elf/Mips/rel-dynamic-11.test
index 20295396cd0..01edbd64812 100644
--- a/lld/test/elf/Mips/rel-dynamic-11.test
+++ b/lld/test/elf/Mips/rel-dynamic-11.test
@@ -6,9 +6,9 @@
# b) There should be no PLT entries.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t1.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t1.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t2.so %t-o.o %t1.so
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t2.so %t-o.o %t1.so
# RUN: llvm-readobj -dt -r -s %t2.so | FileCheck -check-prefix=PLT-SYM %s
# PLT-SYM: Sections [
diff --git a/lld/test/elf/Mips/rel-dynamic-12.test b/lld/test/elf/Mips/rel-dynamic-12.test
index 819ab19ce04..c684df3f262 100644
--- a/lld/test/elf/Mips/rel-dynamic-12.test
+++ b/lld/test/elf/Mips/rel-dynamic-12.test
@@ -8,9 +8,9 @@
# a pointer equality.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -dt -r %t.exe | FileCheck -check-prefix=PLT-SYM %s
# RUN: llvm-readobj -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-dynamic-13.test b/lld/test/elf/Mips/rel-dynamic-13.test
index c8ed28440c3..2bf014e5102 100644
--- a/lld/test/elf/Mips/rel-dynamic-13.test
+++ b/lld/test/elf/Mips/rel-dynamic-13.test
@@ -6,9 +6,9 @@
# b) Applying addendum from the original relocation.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=RAW %s
# RUN: llvm-readobj -r %t.exe | FileCheck -check-prefix=REL %s
diff --git a/lld/test/elf/Mips/rel-dynamic-14.test b/lld/test/elf/Mips/rel-dynamic-14.test
index eef8bfe03ff..33197ae92b8 100644
--- a/lld/test/elf/Mips/rel-dynamic-14.test
+++ b/lld/test/elf/Mips/rel-dynamic-14.test
@@ -6,9 +6,9 @@
# b) Applying addendum from the original relocation.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mips64el -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mips64el -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=RAW %s
# RUN: llvm-readobj -r %t.exe | FileCheck -check-prefix=REL %s
diff --git a/lld/test/elf/Mips/rel-dynamic-15.test b/lld/test/elf/Mips/rel-dynamic-15.test
index 8bd486f0127..13e2083bfc0 100644
--- a/lld/test/elf/Mips/rel-dynamic-15.test
+++ b/lld/test/elf/Mips/rel-dynamic-15.test
@@ -2,7 +2,7 @@
# symbols if the symbols referenced by R_MIPS_32 relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o
# RUN: llvm-objdump -s %t.so | FileCheck -check-prefix=RAW %s
# RUN: llvm-readobj -r %t.so | FileCheck -check-prefix=REL %s
diff --git a/lld/test/elf/Mips/rel-eh-01.test b/lld/test/elf/Mips/rel-eh-01.test
index ce76158f575..08e5d78683a 100644
--- a/lld/test/elf/Mips/rel-eh-01.test
+++ b/lld/test/elf/Mips/rel-eh-01.test
@@ -2,10 +2,10 @@
# calculation, adding GOT entries etc.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t.so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t1.o
# RUN: yaml2obj -format=elf -docnum 3 %s > %t2.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t1.o %t2.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t1.o %t2.o %t.so
# RUN: llvm-objdump -s -t %t.exe | FileCheck -check-prefix=RAW %s
# RUN: llvm-readobj -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-eh-02.test b/lld/test/elf/Mips/rel-eh-02.test
index df2c028995e..e78c967ed30 100644
--- a/lld/test/elf/Mips/rel-eh-02.test
+++ b/lld/test/elf/Mips/rel-eh-02.test
@@ -7,9 +7,9 @@
# c) No entries in the dynamic symbols table has the STO_MIPS_PLT flag.
#
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o %t.so
# RUN: llvm-readobj -dt -r %t.exe | FileCheck -check-prefix=PLT-SYM %s
# PLT-SYM: Relocations [
diff --git a/lld/test/elf/Mips/rel-eh-03.test b/lld/test/elf/Mips/rel-eh-03.test
index a8927185061..63ed74cd56f 100644
--- a/lld/test/elf/Mips/rel-eh-03.test
+++ b/lld/test/elf/Mips/rel-eh-03.test
@@ -2,7 +2,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t1.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.o
-# RUN: lld -flavor gnu -target mipsel -e T0 \
+# RUN: lld -flavor old-gnu -target mipsel -e T0 \
# RUN: -pcrel-eh-reloc -o %t.exe %t1.o %t2.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck -check-prefix=RAW %s
diff --git a/lld/test/elf/Mips/rel-got-hilo-01.test b/lld/test/elf/Mips/rel-got-hilo-01.test
index 09e0c392c3e..c73d8765cbd 100644
--- a/lld/test/elf/Mips/rel-got-hilo-01.test
+++ b/lld/test/elf/Mips/rel-got-hilo-01.test
@@ -1,9 +1,9 @@
# Check handling of R_MIPS_GOT_HI16 / R_MIPS_GOT_LO16 relocations.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t1.so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t1.so %t1.so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t1.so %t1.so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t2.so %t2.so.o %t1.so
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t2.so %t2.so.o %t1.so
# RUN: llvm-objdump -s -t %t2.so | FileCheck -check-prefix=RAW %s
# RUN: llvm-readobj -mips-plt-got %t2.so | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-got-hilo-micro.test b/lld/test/elf/Mips/rel-got-hilo-micro.test
index f3c9214b249..39dd1848f92 100644
--- a/lld/test/elf/Mips/rel-got-hilo-micro.test
+++ b/lld/test/elf/Mips/rel-got-hilo-micro.test
@@ -1,9 +1,9 @@
# Check handling of R_MICROMIPS_GOT_HI16 / R_MICROMIPS_GOT_LO16 relocations.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t1.so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t1.so %t1.so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t1.so %t1.so.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.so.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t2.so %t2.so.o %t1.so
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t2.so %t2.so.o %t1.so
# RUN: llvm-objdump -s -t %t2.so | FileCheck -check-prefix=RAW %s
# RUN: llvm-readobj -mips-plt-got %t2.so | FileCheck -check-prefix=GOT %s
diff --git a/lld/test/elf/Mips/rel-gprel16-micro-overflow.test b/lld/test/elf/Mips/rel-gprel16-micro-overflow.test
index c4f3456f523..7b023aecba4 100644
--- a/lld/test/elf/Mips/rel-gprel16-micro-overflow.test
+++ b/lld/test/elf/Mips/rel-gprel16-micro-overflow.test
@@ -1,7 +1,7 @@
# Check R_MICROMIPS_GPREL16 relocation overflow handling.
#
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -shared -o %t.so %t.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o 2>&1 \
# RUN: | FileCheck %s
# CHECK: Relocation out of range in file {{.*}} reference from +0 to L0+0 of type 136 (R_MICROMIPS_GPREL16)
diff --git a/lld/test/elf/Mips/rel-gprel16-micro.test b/lld/test/elf/Mips/rel-gprel16-micro.test
index a7b37a5dfda..c0119a51e48 100644
--- a/lld/test/elf/Mips/rel-gprel16-micro.test
+++ b/lld/test/elf/Mips/rel-gprel16-micro.test
@@ -1,7 +1,7 @@
# Check R_MICROMIPS_GPREL16 relocation handling.
#
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o
# RUN: llvm-readobj -symbols %t.so | FileCheck -check-prefix=SYM %s
# RUN: llvm-objdump -s %t.so | FileCheck -check-prefix=SEC %s
diff --git a/lld/test/elf/Mips/rel-gprel16-overflow.test b/lld/test/elf/Mips/rel-gprel16-overflow.test
index e683ecea9fe..2943b5d200f 100644
--- a/lld/test/elf/Mips/rel-gprel16-overflow.test
+++ b/lld/test/elf/Mips/rel-gprel16-overflow.test
@@ -1,7 +1,7 @@
# Check R_MIPS_GPREL16 relocation overflow handling.
#
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -shared -o %t.so %t.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o 2>&1 \
# RUN: | FileCheck %s
# CHECK: Relocation out of range in file {{.*}} reference from +0 to T1+-32768 of type 7 (R_MIPS_GPREL16)
diff --git a/lld/test/elf/Mips/rel-gprel16.test b/lld/test/elf/Mips/rel-gprel16.test
index abd44a72a4b..d7e8a1a9259 100644
--- a/lld/test/elf/Mips/rel-gprel16.test
+++ b/lld/test/elf/Mips/rel-gprel16.test
@@ -1,7 +1,7 @@
# Check R_MIPS_GPREL16 relocation handling.
#
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target mipsel -e G1 -shared -o %t.so %t-obj
+# RUN: lld -flavor old-gnu -target mipsel -e G1 -shared -o %t.so %t-obj
# RUN: llvm-readobj -symbols %t.so | FileCheck -check-prefix=SYM %s
# RUN: llvm-objdump -s %t.so | FileCheck -check-prefix=SEC %s
diff --git a/lld/test/elf/Mips/rel-gprel32-64.test b/lld/test/elf/Mips/rel-gprel32-64.test
index e487f97c944..15498a693e4 100644
--- a/lld/test/elf/Mips/rel-gprel32-64.test
+++ b/lld/test/elf/Mips/rel-gprel32-64.test
@@ -1,7 +1,7 @@
# Check R_MIPS_GPREL32/R_MIPS_64 relocations handling.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64el -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips64el -e T0 -o %t.exe %t.o
# RUN: llvm-readobj -r %t.exe | FileCheck --check-prefix=REL-EXE %s
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# RUN: llvm-nm %t.exe | FileCheck --check-prefix=SYM %s
@@ -16,7 +16,7 @@
# SYM: 00000001200001e8 t LT1
# SYM: 0000000120001000 N _GLOBAL_OFFSET_TABLE_
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t.o
# RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=REL-SO %s
# REL-SO: Relocations [
diff --git a/lld/test/elf/Mips/rel-gprel32.test b/lld/test/elf/Mips/rel-gprel32.test
index db84a289211..14ec8cebcab 100644
--- a/lld/test/elf/Mips/rel-gprel32.test
+++ b/lld/test/elf/Mips/rel-gprel32.test
@@ -1,7 +1,7 @@
# Check R_MIPS_GPREL32 relocation handling.
#
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target mipsel -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target mipsel -o %t-exe %t-obj
# RUN: llvm-readobj -symbols %t-exe | FileCheck -check-prefix=SYM %s
# RUN: llvm-objdump -s %t-exe | FileCheck -check-prefix=SEC %s
diff --git a/lld/test/elf/Mips/rel-gprel7-micro-overflow.test b/lld/test/elf/Mips/rel-gprel7-micro-overflow.test
index 68621bc0c76..5609786aa04 100644
--- a/lld/test/elf/Mips/rel-gprel7-micro-overflow.test
+++ b/lld/test/elf/Mips/rel-gprel7-micro-overflow.test
@@ -1,7 +1,7 @@
# Check R_MICROMIPS_GPREL7_S2 relocation overflow handling.
#
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -shared -o %t.so %t.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o 2>&1 \
# RUN: | FileCheck %s
# CHECK: Relocation out of range in file {{.*}} reference from +0 to L0+-4 of type 172 (R_MICROMIPS_GPREL7_S2)
diff --git a/lld/test/elf/Mips/rel-gprel7-micro.test b/lld/test/elf/Mips/rel-gprel7-micro.test
index ae12db4b60c..b7790d9d169 100644
--- a/lld/test/elf/Mips/rel-gprel7-micro.test
+++ b/lld/test/elf/Mips/rel-gprel7-micro.test
@@ -1,7 +1,7 @@
# Check R_MICROMIPS_GPREL7_S2 relocation handling.
#
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o
# RUN: llvm-readobj -symbols %t.so | FileCheck -check-prefix=SYM %s
# RUN: llvm-objdump -s %t.so | FileCheck -check-prefix=SEC %s
diff --git a/lld/test/elf/Mips/rel-hi0-lo16-micro.test b/lld/test/elf/Mips/rel-hi0-lo16-micro.test
index a9b84ebcf5d..82f62954b99 100644
--- a/lld/test/elf/Mips/rel-hi0-lo16-micro.test
+++ b/lld/test/elf/Mips/rel-hi0-lo16-micro.test
@@ -1,7 +1,7 @@
# Check handling of R_MICROMIPS_HI0_LO16 relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/rel-high-01.test b/lld/test/elf/Mips/rel-high-01.test
index 1f6bf7be23e..613fedbe31d 100644
--- a/lld/test/elf/Mips/rel-high-01.test
+++ b/lld/test/elf/Mips/rel-high-01.test
@@ -3,7 +3,7 @@
# Check handling R_MIPS_HIGHER / R_MIPS_HIGHEST relocations.
# RUN: llvm-mc -arch=mips64el -filetype=obj -o=%t.o %s
-# RUN: lld -flavor gnu -target mips64el -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips64el -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -d %t.exe | FileCheck %s
# CHECK: Disassembly of section .text:
diff --git a/lld/test/elf/Mips/rel-high-02.test b/lld/test/elf/Mips/rel-high-02.test
index c4950348157..7a40a617a68 100644
--- a/lld/test/elf/Mips/rel-high-02.test
+++ b/lld/test/elf/Mips/rel-high-02.test
@@ -3,7 +3,7 @@
# Check handling R_MICROMIPS_HIGHER / R_MICROMIPS_HIGHEST relocations.
# RUN: llvm-mc -arch=mips64el -filetype=obj -o=%t.o %s
-# RUN: lld -flavor gnu -target mips64el -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips64el -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -d %t.exe | FileCheck %s
# CHECK: Disassembly of section .text:
diff --git a/lld/test/elf/Mips/rel-jalr-01.test b/lld/test/elf/Mips/rel-jalr-01.test
index 48f7c44fa18..3c519056e1a 100644
--- a/lld/test/elf/Mips/rel-jalr-01.test
+++ b/lld/test/elf/Mips/rel-jalr-01.test
@@ -3,9 +3,9 @@
# Check handling of the R_MIPS_JALR relocation.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t1.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t1.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t1.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.o
-# RUN: lld -flavor gnu -target mipsel -o %t.exe %t2.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -o %t.exe %t2.o %t.so
# RUN: llvm-objdump -d %t.exe | FileCheck %s
# CHECK: __start:
diff --git a/lld/test/elf/Mips/rel-jalr-02.test b/lld/test/elf/Mips/rel-jalr-02.test
index 2a4e4df3678..e9c74c4c330 100644
--- a/lld/test/elf/Mips/rel-jalr-02.test
+++ b/lld/test/elf/Mips/rel-jalr-02.test
@@ -4,7 +4,7 @@
# in case of relocatable targets.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t.o
# RUN: llvm-objdump -d %t.so | FileCheck %s
# CHECK: __start:
diff --git a/lld/test/elf/Mips/rel-lit-micro.test b/lld/test/elf/Mips/rel-lit-micro.test
index 1a4671dba7b..783b24f8381 100644
--- a/lld/test/elf/Mips/rel-lit-micro.test
+++ b/lld/test/elf/Mips/rel-lit-micro.test
@@ -1,7 +1,7 @@
# Check handling of R_MICROMIPS_LITERAL relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/rel-lit.test b/lld/test/elf/Mips/rel-lit.test
index dcdc5429b7a..19aa6872169 100644
--- a/lld/test/elf/Mips/rel-lit.test
+++ b/lld/test/elf/Mips/rel-lit.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_LITERAL relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/rel-pc-hilo.test b/lld/test/elf/Mips/rel-pc-hilo.test
index 572b693457b..6791926762b 100644
--- a/lld/test/elf/Mips/rel-pc-hilo.test
+++ b/lld/test/elf/Mips/rel-pc-hilo.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_PCHI16 / R_MIPS_PCLO16 relocations.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/rel-pc16-align.test b/lld/test/elf/Mips/rel-pc16-align.test
index 6a0e61d8663..6366a4d67e9 100644
--- a/lld/test/elf/Mips/rel-pc16-align.test
+++ b/lld/test/elf/Mips/rel-pc16-align.test
@@ -1,7 +1,7 @@
# Check incorrect alignment handling for R_MIPS_PC16 relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
# RUN: | FileCheck %s
# CHECK: Relocation not aligned in file {{.*}} reference from T0+0 to T1+0 of type 10 (R_MIPS_PC16)
diff --git a/lld/test/elf/Mips/rel-pc16-overflow.test b/lld/test/elf/Mips/rel-pc16-overflow.test
index d1844b6e5b8..910482ee615 100644
--- a/lld/test/elf/Mips/rel-pc16-overflow.test
+++ b/lld/test/elf/Mips/rel-pc16-overflow.test
@@ -1,7 +1,7 @@
# Check R_MIPS_PC16 relocation overflow handling.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
# RUN: | FileCheck %s
# CHECK: Relocation out of range in file {{.*}} reference from T0+0 to T1+131068 of type 10 (R_MIPS_PC16)
diff --git a/lld/test/elf/Mips/rel-pc16.test b/lld/test/elf/Mips/rel-pc16.test
index 903e234c26e..f298afd81cd 100644
--- a/lld/test/elf/Mips/rel-pc16.test
+++ b/lld/test/elf/Mips/rel-pc16.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_PC16 relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/rel-pc18-s3-align.test b/lld/test/elf/Mips/rel-pc18-s3-align.test
index 29972bf5acc..ca2fa18ecaa 100644
--- a/lld/test/elf/Mips/rel-pc18-s3-align.test
+++ b/lld/test/elf/Mips/rel-pc18-s3-align.test
@@ -1,7 +1,7 @@
# Check incorrect alignment handling for R_MIPS_PC18_S3 relocation target.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
# RUN: | FileCheck %s
# CHECK: Relocation not aligned in file {{.*}} reference from T1+0 to T1+0 of type 62 (R_MIPS_PC18_S3)
diff --git a/lld/test/elf/Mips/rel-pc18-s3-micro.test b/lld/test/elf/Mips/rel-pc18-s3-micro.test
index e9f84411368..fc143a75e56 100644
--- a/lld/test/elf/Mips/rel-pc18-s3-micro.test
+++ b/lld/test/elf/Mips/rel-pc18-s3-micro.test
@@ -1,7 +1,7 @@
# Check handling of R_MICROMIPS_PC18_S3 relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/rel-pc18-s3.test b/lld/test/elf/Mips/rel-pc18-s3.test
index 1304a9e8773..d61427448d5 100644
--- a/lld/test/elf/Mips/rel-pc18-s3.test
+++ b/lld/test/elf/Mips/rel-pc18-s3.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_PC18_S3 relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/rel-pc19-s2-align.test b/lld/test/elf/Mips/rel-pc19-s2-align.test
index 72b796c83f7..19010a44557 100644
--- a/lld/test/elf/Mips/rel-pc19-s2-align.test
+++ b/lld/test/elf/Mips/rel-pc19-s2-align.test
@@ -1,7 +1,7 @@
# Check incorrect alignment handling for R_MIPS_PC19_S2 relocation target.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
# RUN: | FileCheck %s
# CHECK: Relocation not aligned in file {{.*}} reference from T0+0 to T1+0 of type 63 (R_MIPS_PC19_S2)
diff --git a/lld/test/elf/Mips/rel-pc19-s2-micro.test b/lld/test/elf/Mips/rel-pc19-s2-micro.test
index f7128d813ac..d9a930e41d8 100644
--- a/lld/test/elf/Mips/rel-pc19-s2-micro.test
+++ b/lld/test/elf/Mips/rel-pc19-s2-micro.test
@@ -1,7 +1,7 @@
# Check handling of R_MICROMIPS_PC19_S2 relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/rel-pc19-s2.test b/lld/test/elf/Mips/rel-pc19-s2.test
index 1a15d324913..da21864a121 100644
--- a/lld/test/elf/Mips/rel-pc19-s2.test
+++ b/lld/test/elf/Mips/rel-pc19-s2.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_PC19_S2 relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/rel-pc21-s2-align.test b/lld/test/elf/Mips/rel-pc21-s2-align.test
index f56b298cdf0..a79e1e2a46e 100644
--- a/lld/test/elf/Mips/rel-pc21-s2-align.test
+++ b/lld/test/elf/Mips/rel-pc21-s2-align.test
@@ -1,7 +1,7 @@
# Check incorrect alignment handling for R_MIPS_PC21_S2 relocation target.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
# RUN: | FileCheck %s
# CHECK: Relocation not aligned in file {{.*}} reference from T0+0 to T1+0 of type 60 (R_MIPS_PC21_S2)
diff --git a/lld/test/elf/Mips/rel-pc21-s2-micro.test b/lld/test/elf/Mips/rel-pc21-s2-micro.test
index 46426034c26..4aa0a7de948 100644
--- a/lld/test/elf/Mips/rel-pc21-s2-micro.test
+++ b/lld/test/elf/Mips/rel-pc21-s2-micro.test
@@ -1,7 +1,7 @@
# Check handling of R_MICROMIPS_PC21_S2 relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/rel-pc21-s2-overflow.test b/lld/test/elf/Mips/rel-pc21-s2-overflow.test
index 3a9c1c1e636..ad88e0c14b4 100644
--- a/lld/test/elf/Mips/rel-pc21-s2-overflow.test
+++ b/lld/test/elf/Mips/rel-pc21-s2-overflow.test
@@ -1,7 +1,7 @@
# Check R_MIPS_PC21_S2 relocation overflow handling.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -shared -o %t.exe %t.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -shared -o %t.exe %t.o 2>&1 \
# RUN: | FileCheck %s
# CHECK: Relocation out of range in file {{.*}} reference from T0+0 to T1+4194300 of type 60 (R_MIPS_PC21_S2)
diff --git a/lld/test/elf/Mips/rel-pc21-s2.test b/lld/test/elf/Mips/rel-pc21-s2.test
index 32497541720..c2b58c859af 100644
--- a/lld/test/elf/Mips/rel-pc21-s2.test
+++ b/lld/test/elf/Mips/rel-pc21-s2.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_PC21_S2 relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/rel-pc26-s2-align.test b/lld/test/elf/Mips/rel-pc26-s2-align.test
index 52c66205b52..23e66084836 100644
--- a/lld/test/elf/Mips/rel-pc26-s2-align.test
+++ b/lld/test/elf/Mips/rel-pc26-s2-align.test
@@ -1,7 +1,7 @@
# Check incorrect alignment handling for R_MIPS_PC26_S2 relocation target.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
# RUN: | FileCheck %s
# CHECK: Relocation not aligned in file {{.*}} reference from T0+0 to T1+0 of type 61 (R_MIPS_PC26_S2)
diff --git a/lld/test/elf/Mips/rel-pc26-s2-micro.test b/lld/test/elf/Mips/rel-pc26-s2-micro.test
index 249f61b81d0..193c328be68 100644
--- a/lld/test/elf/Mips/rel-pc26-s2-micro.test
+++ b/lld/test/elf/Mips/rel-pc26-s2-micro.test
@@ -1,7 +1,7 @@
# Check handling of R_MICROMIPS_PC26_S2 relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/rel-pc26-s2.test b/lld/test/elf/Mips/rel-pc26-s2.test
index 08e720146f2..c500f00cb86 100644
--- a/lld/test/elf/Mips/rel-pc26-s2.test
+++ b/lld/test/elf/Mips/rel-pc26-s2.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_PC26_S2 relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/rel-pc32.test b/lld/test/elf/Mips/rel-pc32.test
index 7a3131befdb..9faa32efec7 100644
--- a/lld/test/elf/Mips/rel-pc32.test
+++ b/lld/test/elf/Mips/rel-pc32.test
@@ -1,6 +1,6 @@
# Check handling of R_MIPS_PC32 relocation.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target mipsel -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target mipsel -o %t-exe %t-obj
# RUN: llvm-objdump -s -t %t-exe | FileCheck %s
# CHECK: Contents of section .data:
diff --git a/lld/test/elf/Mips/rel-pc7-10-16-23.test b/lld/test/elf/Mips/rel-pc7-10-16-23.test
index b28af72fb20..51c4c3a670f 100644
--- a/lld/test/elf/Mips/rel-pc7-10-16-23.test
+++ b/lld/test/elf/Mips/rel-pc7-10-16-23.test
@@ -2,7 +2,7 @@
# R_MICROMIPS_PC16_S1, and R_MICROMIPS_PC23_S2 relocations.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target mipsel -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target mipsel -o %t-exe %t-obj
# RUN: llvm-objdump -s -t %t-exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/rel-sub-micro.test b/lld/test/elf/Mips/rel-sub-micro.test
index c1b95d377fc..831a020ce2f 100644
--- a/lld/test/elf/Mips/rel-sub-micro.test
+++ b/lld/test/elf/Mips/rel-sub-micro.test
@@ -1,7 +1,7 @@
# Check handling of R_MICROMIPS_SUB relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64el -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips64el -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .data:
diff --git a/lld/test/elf/Mips/rel-sub.test b/lld/test/elf/Mips/rel-sub.test
index 93e569a2203..5100406fd5d 100644
--- a/lld/test/elf/Mips/rel-sub.test
+++ b/lld/test/elf/Mips/rel-sub.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_SUB relocation.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64el -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips64el -o %t.exe %t.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .data:
diff --git a/lld/test/elf/Mips/rld_map.test b/lld/test/elf/Mips/rld_map.test
index 74285747d2a..ee063be1d7f 100644
--- a/lld/test/elf/Mips/rld_map.test
+++ b/lld/test/elf/Mips/rld_map.test
@@ -4,7 +4,7 @@
# .rld_map section, and __RLD_MAP symbol.
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
-# RUN: lld -flavor gnu -target mips %t.o -o %t.exe
+# RUN: lld -flavor old-gnu -target mips %t.o -o %t.exe
# RUN: llvm-readobj -dynamic-table -s -st %t.exe \
# RUN: | FileCheck -check-prefix=EXE-DYN %s
@@ -28,12 +28,12 @@
# EXE-DYN: 0x70000016 MIPS_RLD_MAP 0x[[ADDR]]
# EXE-DYN: 0x70000035 MIPS_RLD_MAP_REL 0x1E48
-# RUN: lld -flavor gnu -target mips -static %t.o -o %t.exe
+# RUN: lld -flavor old-gnu -target mips -static %t.o -o %t.exe
# RUN: llvm-nm -just-symbol-name %t.exe | FileCheck -check-prefix=EXE-STATIC %s
# EXE-STATIC-NOT: __RLD_MAP
-# RUN: lld -flavor gnu -target mips -shared %t.o -o %t.so
+# RUN: lld -flavor old-gnu -target mips -shared %t.o -o %t.so
# RUN: llvm-nm -just-symbol-name %t.so | FileCheck -check-prefix=DYNLIB %s
# DYNLIB-NOT: __RLD_MAP
diff --git a/lld/test/elf/Mips/sign-rela.test b/lld/test/elf/Mips/sign-rela.test
index 79e230e67c1..3e5341f2c23 100644
--- a/lld/test/elf/Mips/sign-rela.test
+++ b/lld/test/elf/Mips/sign-rela.test
@@ -1,7 +1,7 @@
# Check that relocation addend read from RELA record is not sign-extended.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target mips64el -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips64el -o %t.exe %t.o
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# CHECK: {{[0-9a-f]+}} 01000000 00000000 ........
diff --git a/lld/test/elf/Mips/st-other.test b/lld/test/elf/Mips/st-other.test
index e995bd8c9e6..2bb1f8b96e0 100644
--- a/lld/test/elf/Mips/st-other.test
+++ b/lld/test/elf/Mips/st-other.test
@@ -5,10 +5,10 @@
# RUN: yaml2obj -format=elf %s > %t-micro.o
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-micro.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-micro.o
# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck -check-prefix=SO %s
-# RUN: lld -flavor gnu -target mipsel -e S0 -o %t.exe %t-micro.o
+# RUN: lld -flavor old-gnu -target mipsel -e S0 -o %t.exe %t-micro.o
# RUN: llvm-readobj -symbols %t.exe | FileCheck -check-prefix=EXE-SYM %s
# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=EXE-DSYM %s
diff --git a/lld/test/elf/Mips/static-01.test b/lld/test/elf/Mips/static-01.test
index 1c8a11ee8da..77a33469df3 100644
--- a/lld/test/elf/Mips/static-01.test
+++ b/lld/test/elf/Mips/static-01.test
@@ -3,7 +3,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t1.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.o
-# RUN: lld -flavor gnu -target mipsel -e T0 -static -o %t.exe %t1.o %t2.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -static -o %t.exe %t1.o %t2.o
# RUN: llvm-nm %t.exe | FileCheck %s
# CHECK: 00401000 N _GLOBAL_OFFSET_TABLE_
diff --git a/lld/test/elf/Mips/tls-1-micro.test b/lld/test/elf/Mips/tls-1-micro.test
index 0c20afc31c4..f47592a5ab7 100644
--- a/lld/test/elf/Mips/tls-1-micro.test
+++ b/lld/test/elf/Mips/tls-1-micro.test
@@ -2,7 +2,7 @@
# relocations.
# RUN: yaml2obj -format=elf -o %t.o %s
-# RUN: lld -flavor gnu -target mipsel -e L0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e L0 -o %t.exe %t.o
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/tls-1.test b/lld/test/elf/Mips/tls-1.test
index be1f2f0b5a5..c25a06c1dee 100644
--- a/lld/test/elf/Mips/tls-1.test
+++ b/lld/test/elf/Mips/tls-1.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_TLS_TPREL_HI16 / R_MIPS_TLS_TPREL_LO16 relocations.
# RUN: yaml2obj -format=elf -o %t.o %s
-# RUN: lld -flavor gnu -target mipsel -e L0 -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e L0 -o %t.exe %t.o
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/tls-2-64-static.test b/lld/test/elf/Mips/tls-2-64-static.test
index 758c8aa76b8..c8c30ea06c6 100644
--- a/lld/test/elf/Mips/tls-2-64-static.test
+++ b/lld/test/elf/Mips/tls-2-64-static.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_TLS_GD relocation in case of -static linking.
# RUN: yaml2obj -format=elf -o %t.o %s
-# RUN: lld -flavor gnu -target mips64el -e T0 -static -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips64el -e T0 -static -o %t.exe %t.o
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/tls-2-64.test b/lld/test/elf/Mips/tls-2-64.test
index a068934aeaf..3a6f6b3bede 100644
--- a/lld/test/elf/Mips/tls-2-64.test
+++ b/lld/test/elf/Mips/tls-2-64.test
@@ -4,7 +4,7 @@
# Create a shared library with thread symbol D1.
# RUN: yaml2obj -format=elf -o %t-so.o %s
-# RUN: lld -flavor gnu -target mips64el -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mips64el -shared -o %t.so %t-so.o
# Check dynamic relocations and GOT in the shared library.
# RUN: llvm-readobj -r %t.so | FileCheck -check-prefix=REL %s
diff --git a/lld/test/elf/Mips/tls-2-micro.test b/lld/test/elf/Mips/tls-2-micro.test
index 5a1fe2904ac..88d8797cd06 100644
--- a/lld/test/elf/Mips/tls-2-micro.test
+++ b/lld/test/elf/Mips/tls-2-micro.test
@@ -4,7 +4,7 @@
# Create a shared library with thread symbol D1.
# RUN: yaml2obj -format=elf -o %t-so.o %s
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# Check dynamic relocations and GOT in the shared library.
# RUN: llvm-readobj -r %t.so | FileCheck -check-prefix=REL %s
diff --git a/lld/test/elf/Mips/tls-2-static.test b/lld/test/elf/Mips/tls-2-static.test
index 41bc136a2b7..3ac2122628d 100644
--- a/lld/test/elf/Mips/tls-2-static.test
+++ b/lld/test/elf/Mips/tls-2-static.test
@@ -2,7 +2,7 @@
# RUN: yaml2obj -format=elf -docnum 1 -o %t1.o %s
# RUN: yaml2obj -format=elf -docnum 2 -o %t2.o %s
-# RUN: lld -flavor gnu -target mipsel -e T0 -static -o %t.exe %t1.o %t2.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -static -o %t.exe %t1.o %t2.o
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/tls-2.test b/lld/test/elf/Mips/tls-2.test
index 32b2bc10511..de8fc2a7086 100644
--- a/lld/test/elf/Mips/tls-2.test
+++ b/lld/test/elf/Mips/tls-2.test
@@ -4,7 +4,7 @@
# Create a shared library with thread symbol D1.
# RUN: yaml2obj -format=elf -o %t-so.o %s
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# Check dynamic relocations and GOT in the shared library.
# RUN: llvm-readobj -r %t.so | FileCheck -check-prefix=REL %s
diff --git a/lld/test/elf/Mips/tls-3-64-static.test b/lld/test/elf/Mips/tls-3-64-static.test
index 250c340df0d..2183d1fd683 100644
--- a/lld/test/elf/Mips/tls-3-64-static.test
+++ b/lld/test/elf/Mips/tls-3-64-static.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_TLS_GOTTPREL relocation in case of -static linking.
# RUN: yaml2obj -format=elf -o %t.o %s
-# RUN: lld -flavor gnu -target mips64el -e T0 -static -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips64el -e T0 -static -o %t.exe %t.o
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/tls-3-micro.test b/lld/test/elf/Mips/tls-3-micro.test
index 0e0f3d556f8..347332e6633 100644
--- a/lld/test/elf/Mips/tls-3-micro.test
+++ b/lld/test/elf/Mips/tls-3-micro.test
@@ -4,13 +4,13 @@
# Create a shared library with thread symbol D1.
# RUN: yaml2obj -format=elf -docnum 1 -o %t-so.o %s
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# Create executable file linked using two object files and the shared library.
# The object files defines thread symbols D0 and D2.
# RUN: yaml2obj -format=elf -docnum 2 -o %t-o1.o %s
# RUN: yaml2obj -format=elf -docnum 3 -o %t-o2.o %s
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o1.o %t-o2.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o1.o %t-o2.o %t.so
# Check dynamic relocations and GOT in the executable file.
# RUN: llvm-readobj -r %t.exe | FileCheck -check-prefix=REL %s
diff --git a/lld/test/elf/Mips/tls-3-static.test b/lld/test/elf/Mips/tls-3-static.test
index e7fdbc7b8cb..5d3a7b8bfd6 100644
--- a/lld/test/elf/Mips/tls-3-static.test
+++ b/lld/test/elf/Mips/tls-3-static.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_TLS_GOTTPREL relocation in case of -static linking.
# RUN: yaml2obj -format=elf -o %t.o %s
-# RUN: lld -flavor gnu -target mipsel -e T0 -static -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -static -o %t.exe %t.o
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/tls-3.test b/lld/test/elf/Mips/tls-3.test
index 7e54724fade..eb9750fee28 100644
--- a/lld/test/elf/Mips/tls-3.test
+++ b/lld/test/elf/Mips/tls-3.test
@@ -4,13 +4,13 @@
# Create a shared library with thread symbol D1.
# RUN: yaml2obj -format=elf -docnum 1 -o %t-so.o %s
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so.o
# Create executable file linked using two object files and the shared library.
# The object files defines thread symbols D0 and D2.
# RUN: yaml2obj -format=elf -docnum 2 -o %t-o1.o %s
# RUN: yaml2obj -format=elf -docnum 3 -o %t-o2.o %s
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o1.o %t-o2.o %t.so
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o1.o %t-o2.o %t.so
# Check dynamic relocations and GOT in the executable file.
# RUN: llvm-readobj -r %t.exe | FileCheck -check-prefix=REL %s
diff --git a/lld/test/elf/Mips/tls-4-64-static.test b/lld/test/elf/Mips/tls-4-64-static.test
index 36b975e53fc..3aa37046d36 100644
--- a/lld/test/elf/Mips/tls-4-64-static.test
+++ b/lld/test/elf/Mips/tls-4-64-static.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_TLS_LDM relocation in case of -static linking.
# RUN: yaml2obj -format=elf -o %t.o %s
-# RUN: lld -flavor gnu -target mips64el -e T0 -static -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mips64el -e T0 -static -o %t.exe %t.o
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/tls-4-micro.test b/lld/test/elf/Mips/tls-4-micro.test
index 1b0d03fa887..23d8e0a1de3 100644
--- a/lld/test/elf/Mips/tls-4-micro.test
+++ b/lld/test/elf/Mips/tls-4-micro.test
@@ -3,7 +3,7 @@
# RUN: yaml2obj -format=elf -docnum 1 -o %t-so1.o %s
# RUN: yaml2obj -format=elf -docnum 2 -o %t-so2.o %s
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so1.o %t-so2.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so1.o %t-so2.o
# RUN: llvm-readobj -r %t.so | FileCheck -check-prefix=REL %s
# RUN: llvm-readobj -dynamic-table %t.so | FileCheck -check-prefix=DYN %s
diff --git a/lld/test/elf/Mips/tls-4-static.test b/lld/test/elf/Mips/tls-4-static.test
index 3d8bcc5a0c6..5fdb11df874 100644
--- a/lld/test/elf/Mips/tls-4-static.test
+++ b/lld/test/elf/Mips/tls-4-static.test
@@ -1,7 +1,7 @@
# Check handling of R_MIPS_TLS_LDM relocation in case of -static linking.
# RUN: yaml2obj -format=elf -o %t.o %s
-# RUN: lld -flavor gnu -target mipsel -e T0 -static -o %t.exe %t.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -static -o %t.exe %t.o
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/Mips/tls-4.test b/lld/test/elf/Mips/tls-4.test
index fb42f0d9337..95df6d67151 100644
--- a/lld/test/elf/Mips/tls-4.test
+++ b/lld/test/elf/Mips/tls-4.test
@@ -3,7 +3,7 @@
# RUN: yaml2obj -format=elf -docnum 1 -o %t-so1.o %s
# RUN: yaml2obj -format=elf -docnum 2 -o %t-so2.o %s
-# RUN: lld -flavor gnu -target mipsel -shared -o %t.so %t-so1.o %t-so2.o
+# RUN: lld -flavor old-gnu -target mipsel -shared -o %t.so %t-so1.o %t-so2.o
# RUN: llvm-readobj -r %t.so | FileCheck -check-prefix=REL %s
# RUN: llvm-readobj -dynamic-table %t.so | FileCheck -check-prefix=DYN %s
diff --git a/lld/test/elf/Mips/tls-5-64.test b/lld/test/elf/Mips/tls-5-64.test
index 784d71efc48..43e6e6c1cf3 100644
--- a/lld/test/elf/Mips/tls-5-64.test
+++ b/lld/test/elf/Mips/tls-5-64.test
@@ -2,7 +2,7 @@
# by the R_MIPS_TLS_GD relocation gets an entry in the dynamic symbol table.
# RUN: yaml2obj -format=elf -o %t-o.o %s
-# RUN: lld -flavor gnu -target mips64el -e T0 -o %t.exe %t-o.o
+# RUN: lld -flavor old-gnu -target mips64el -e T0 -o %t.exe %t-o.o
# Check dynamic relocations:
# RUN: llvm-readobj -r %t.exe | FileCheck -check-prefix=REL %s
diff --git a/lld/test/elf/Mips/tls-5-micro.test b/lld/test/elf/Mips/tls-5-micro.test
index 89d1d98a687..41245641782 100644
--- a/lld/test/elf/Mips/tls-5-micro.test
+++ b/lld/test/elf/Mips/tls-5-micro.test
@@ -2,7 +2,7 @@
# the R_MICROMIPS_TLS_GD relocation gets an entry in the dynamic symbol table.
# RUN: yaml2obj -format=elf -o %t-o.o %s
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o
# Check dynamic relocations:
# RUN: llvm-readobj -r %t.exe | FileCheck -check-prefix=REL %s
diff --git a/lld/test/elf/Mips/tls-5.test b/lld/test/elf/Mips/tls-5.test
index 378ce321b8c..cb71e3ac5f9 100644
--- a/lld/test/elf/Mips/tls-5.test
+++ b/lld/test/elf/Mips/tls-5.test
@@ -2,7 +2,7 @@
# by the R_MIPS_TLS_GD relocation gets an entry in the dynamic symbol table.
# RUN: yaml2obj -format=elf -o %t-o.o %s
-# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t-o.o
+# RUN: lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t-o.o
# Check dynamic relocations:
# RUN: llvm-readobj -r %t.exe | FileCheck -check-prefix=REL %s
diff --git a/lld/test/elf/Mips/validate-rel-01.test b/lld/test/elf/Mips/validate-rel-01.test
index 585c0b04979..0b8734c5429 100644
--- a/lld/test/elf/Mips/validate-rel-01.test
+++ b/lld/test/elf/Mips/validate-rel-01.test
@@ -2,13 +2,13 @@
# in case of shared library linking.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t-hi.o
-# RUN: not lld -flavor gnu -target mipsel -shared -o %t.so %t-hi.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -shared -o %t.so %t-hi.o 2>&1 \
# RUN: | FileCheck -check-prefix=RHI %s
# RHI: R_MIPS_HI16 (5) relocation cannot be used when making a shared object, recompile {{.*}}validate-rel-01.test.tmp-hi.o with -fPIC
# RUN: yaml2obj -format=elf -docnum 2 %s > %t-26.o
-# RUN: not lld -flavor gnu -target mipsel -shared -o %t.so %t-26.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -shared -o %t.so %t-26.o 2>&1 \
# RUN: | FileCheck -check-prefix=R26 %s
# R26: R_MIPS_26 (4) relocation cannot be used when making a shared object, recompile {{.*}}validate-rel-01.test.tmp-26.o with -fPIC
diff --git a/lld/test/elf/Mips/validate-rel-03.test b/lld/test/elf/Mips/validate-rel-03.test
index 15aefa5114a..baf8516c63b 100644
--- a/lld/test/elf/Mips/validate-rel-03.test
+++ b/lld/test/elf/Mips/validate-rel-03.test
@@ -2,7 +2,7 @@
# against local symbol.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t.o
-# RUN: not lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
+# RUN: not lld -flavor old-gnu -target mipsel -e T0 -o %t.exe %t.o 2>&1 \
# RUN: | FileCheck %s
# CHECK: R_MIPS_CALL16 (11) relocation cannot be used against local symbol L0 in file {{.*}}validate-rel-03.test.tmp.o
diff --git a/lld/test/elf/X86_64/ExampleTarget/triple.test b/lld/test/elf/X86_64/ExampleTarget/triple.test
index 3aecceb4305..aec09eae3a3 100644
--- a/lld/test/elf/X86_64/ExampleTarget/triple.test
+++ b/lld/test/elf/X86_64/ExampleTarget/triple.test
@@ -1,7 +1,7 @@
# Check that the Example Target is actually used.
# RUN: yaml2obj -format=elf %s -o %t.o
-# RUN: lld -flavor gnu -target x86_64-example-freebsd9 %t.o -o %t.exe
+# RUN: lld -flavor old-gnu -target x86_64-example-freebsd9 %t.o -o %t.exe
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
#
# CHECK: Type: 0xFF00
diff --git a/lld/test/elf/X86_64/alignoffset.test b/lld/test/elf/X86_64/alignoffset.test
index 9de54620f67..53e29211af6 100644
--- a/lld/test/elf/X86_64/alignoffset.test
+++ b/lld/test/elf/X86_64/alignoffset.test
@@ -3,7 +3,7 @@
# Build executable
# RUN: yaml2obj -format=elf -docnum 1 %s -o %t.o
-# RUN: lld -flavor gnu -target x86_64 %t.o -o %t.exe -static \
+# RUN: lld -flavor old-gnu -target x86_64 %t.o -o %t.exe -static \
# RUN: --no-align-segments --rosegment --noinhibit-exec
# RUN: llvm-readobj -program-headers %t.exe | FileCheck %s
#
diff --git a/lld/test/elf/X86_64/debug.test b/lld/test/elf/X86_64/debug.test
index a13d12fba38..26ba367da57 100644
--- a/lld/test/elf/X86_64/debug.test
+++ b/lld/test/elf/X86_64/debug.test
@@ -1,10 +1,10 @@
# Test that debug info is assigned typeNoAlloc and that the output sections have
# a virtual address of 0.
-RUN: lld -flavor gnu -target x86_64 -e main --output-filetype=yaml \
+RUN: lld -flavor old-gnu -target x86_64 -e main --output-filetype=yaml \
RUN: %p/Inputs/debug0.x86-64 %p/Inputs/debug1.x86-64 -o %t
RUN: FileCheck %s -check-prefix YAML < %t
-RUN: lld -flavor gnu -target x86_64 -e main %p/Inputs/debug0.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64 -e main %p/Inputs/debug0.x86-64 \
RUN: %p/Inputs/debug1.x86-64 -o %t1
RUN: llvm-readobj -sections %t1 | FileCheck %s -check-prefix ELF
# Verify that non SHF_ALLOC sections are relocated correctly.
diff --git a/lld/test/elf/X86_64/defsym.test b/lld/test/elf/X86_64/defsym.test
index 5d2256a09ac..d98abf39d42 100644
--- a/lld/test/elf/X86_64/defsym.test
+++ b/lld/test/elf/X86_64/defsym.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target x86_64 --defsym=main=fn --noinhibit-exec \
+RUN: lld -flavor old-gnu -target x86_64 --defsym=main=fn --noinhibit-exec \
RUN: %p/Inputs/fn.o -o %t
RUN: llvm-readobj -symbols %t | FileCheck %s
diff --git a/lld/test/elf/X86_64/demangle.test b/lld/test/elf/X86_64/demangle.test
index 1977fd7f1e3..caae8256d99 100644
--- a/lld/test/elf/X86_64/demangle.test
+++ b/lld/test/elf/X86_64/demangle.test
@@ -4,9 +4,9 @@
# Once there is a way to add undefined symbols using yaml2obj, the test will be
# changed.
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/undefcpp.o --noinhibit-exec 2>&1 | FileCheck -check-prefix=DEMANGLE %s
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/undefcpp.o --noinhibit-exec --no-demangle 2>&1 | FileCheck -check-prefix=NODEMANGLE %s
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/undefcpp.o --noinhibit-exec --demangle 2>&1 | FileCheck -check-prefix=DEMANGLE %s
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/undefcpp.o --noinhibit-exec 2>&1 | FileCheck -check-prefix=DEMANGLE %s
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/undefcpp.o --noinhibit-exec --no-demangle 2>&1 | FileCheck -check-prefix=NODEMANGLE %s
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/undefcpp.o --noinhibit-exec --demangle 2>&1 | FileCheck -check-prefix=DEMANGLE %s
#DEMANGLE: undefcpp.o: foo(char const*)
#NODEMANGLE: undefcpp.o: _Z3fooPKc
diff --git a/lld/test/elf/X86_64/dontignorezerosize-sections.test b/lld/test/elf/X86_64/dontignorezerosize-sections.test
index 101e6cb55b2..f3042b5508f 100644
--- a/lld/test/elf/X86_64/dontignorezerosize-sections.test
+++ b/lld/test/elf/X86_64/dontignorezerosize-sections.test
@@ -1,5 +1,5 @@
# This tests that lld is not ignoring zero sized sections
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/zerosizedsection.o \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/zerosizedsection.o \
RUN: --noinhibit-exec --output-filetype=yaml -o %t
RUN: FileCheck %s < %t
diff --git a/lld/test/elf/X86_64/dynamicvars.test b/lld/test/elf/X86_64/dynamicvars.test
index 8b9cdfdbedb..c6f67903832 100644
--- a/lld/test/elf/X86_64/dynamicvars.test
+++ b/lld/test/elf/X86_64/dynamicvars.test
@@ -2,7 +2,7 @@
# values.
#RUN: yaml2obj --format elf -docnum 1 %s -o %t.o
-#RUN: lld -flavor gnu -target x86_64 -e main %t.o -o %t1 --noinhibit-exec
+#RUN: lld -flavor old-gnu -target x86_64 -e main %t.o -o %t1 --noinhibit-exec
#RUN: llvm-readobj -sections -symbols %t1 | FileCheck -check-prefix CHECKSYMS %s
diff --git a/lld/test/elf/X86_64/dynlib-nointerp-section.test b/lld/test/elf/X86_64/dynlib-nointerp-section.test
index dca3d925b38..c23d283d2a6 100644
--- a/lld/test/elf/X86_64/dynlib-nointerp-section.test
+++ b/lld/test/elf/X86_64/dynlib-nointerp-section.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/no-interp-section.o -o %t -shared
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/no-interp-section.o -o %t -shared
RUN: llvm-objdump -section-headers %t | FileCheck %s
CHECK-NOT: .interp
diff --git a/lld/test/elf/X86_64/dynlib-search.test b/lld/test/elf/X86_64/dynlib-search.test
index 017208ac11a..efd7272fb14 100644
--- a/lld/test/elf/X86_64/dynlib-search.test
+++ b/lld/test/elf/X86_64/dynlib-search.test
@@ -1,5 +1,5 @@
# This tests the functionality for finding the shared library libfn.so for ELF
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/main.o -L%p/Inputs/ -lfn -o %t \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/main.o -L%p/Inputs/ -lfn -o %t \
RUN: --noinhibit-exec -t 2> %t1
RUN: FileCheck %s < %t1
diff --git a/lld/test/elf/X86_64/dynsym-weak.test b/lld/test/elf/X86_64/dynsym-weak.test
index 4f05656a41f..8e1cc9fa8ec 100644
--- a/lld/test/elf/X86_64/dynsym-weak.test
+++ b/lld/test/elf/X86_64/dynsym-weak.test
@@ -3,19 +3,19 @@
# symbol as strong.
# RUN: yaml2obj -format=elf -docnum 1 %s > %t.foo.o
-# RUN: lld -flavor gnu -target x86_64 -shared -o %t.so %t.foo.o
+# RUN: lld -flavor old-gnu -target x86_64 -shared -o %t.so %t.foo.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t.main.o
#
# Link executable file with strong symbol. Weak symbol is in the shared lib.
-# RUN: lld -flavor gnu -target x86_64 -e main -o %t1.exe %t.main.o %t.so
+# RUN: lld -flavor old-gnu -target x86_64 -e main -o %t1.exe %t.main.o %t.so
# RUN: llvm-readobj -dyn-symbols %t1.exe | FileCheck -check-prefix=EXE %s
#
# Link executable file. Strong and weak symbol come from different object files.
-# RUN: lld -flavor gnu -target x86_64 -e main -o %t2.exe %t.main.o %t.foo.o
+# RUN: lld -flavor old-gnu -target x86_64 -e main -o %t2.exe %t.main.o %t.foo.o
# RUN: llvm-readobj -dyn-symbols %t2.exe | FileCheck -check-prefix=OBJ %s
#
# Link shared library. Weak symbol is in the another shared lib.
-# RUN: lld -flavor gnu -target x86_64 -shared -o %t.res.so %t.main.o %t.so
+# RUN: lld -flavor old-gnu -target x86_64 -shared -o %t.res.so %t.main.o %t.so
# RUN: llvm-readobj -dyn-symbols %t.res.so | FileCheck -check-prefix=SO %s
# EXE: Symbol {
diff --git a/lld/test/elf/X86_64/extern-tls.test b/lld/test/elf/X86_64/extern-tls.test
index 16a0d5544aa..d22b06057a9 100644
--- a/lld/test/elf/X86_64/extern-tls.test
+++ b/lld/test/elf/X86_64/extern-tls.test
@@ -1,6 +1,6 @@
# This tests verifies that TLS variables have correct offsets
# when variables the TLS variables are not defined in the program
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/externtls.x86-64 -static \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/externtls.x86-64 -static \
RUN: --output-filetype=yaml --noinhibit-exec | FileCheck %s -check-prefix=CHECKGOT
# Currently x86_64 relocation pass handles the R_X86_64_GOTTPOFF by
diff --git a/lld/test/elf/X86_64/general-dynamic-tls.test b/lld/test/elf/X86_64/general-dynamic-tls.test
index cd4683e6da2..12ad1071ae1 100644
--- a/lld/test/elf/X86_64/general-dynamic-tls.test
+++ b/lld/test/elf/X86_64/general-dynamic-tls.test
@@ -10,12 +10,12 @@
# Prepare inputs
#RUN: yaml2obj -format=elf %p/Inputs/generaltls-so.o.yaml -o=%t.o.so
-#RUN: lld -flavor gnu -target x86_64 -shared %t.o.so -o %T/libgeneraltls.so
+#RUN: lld -flavor old-gnu -target x86_64 -shared %t.o.so -o %T/libgeneraltls.so
#RUN: yaml2obj -format=elf %s -o=%t.o
# Link - (we supply --defsym=__tls_get_addr to avoid the need to link with
# system libraries)
-#RUN: lld -flavor gnu -target x86_64 -e main %t.o -L%T -lgeneraltls -o %t1 \
+#RUN: lld -flavor old-gnu -target x86_64 -e main %t.o -L%T -lgeneraltls -o %t1 \
#RUN: --defsym=__tls_get_addr=0
# Check
diff --git a/lld/test/elf/X86_64/imagebase.test b/lld/test/elf/X86_64/imagebase.test
index ad1afe9e5af..7b6f7318d72 100644
--- a/lld/test/elf/X86_64/imagebase.test
+++ b/lld/test/elf/X86_64/imagebase.test
@@ -2,7 +2,7 @@
# Build executable
# RUN: yaml2obj -format=elf -docnum 1 %s -o %t.o
-# RUN: lld -flavor gnu -target x86_64 %t.o -o %t.exe -static \
+# RUN: lld -flavor old-gnu -target x86_64 %t.o -o %t.exe -static \
# RUN: --no-align-segments --noinhibit-exec --image-base 0x600000
# RUN: llvm-readobj -program-headers %t.exe | FileCheck %s
#
diff --git a/lld/test/elf/X86_64/initfini-order.test b/lld/test/elf/X86_64/initfini-order.test
index d3981eb0914..e6afcf64434 100644
--- a/lld/test/elf/X86_64/initfini-order.test
+++ b/lld/test/elf/X86_64/initfini-order.test
@@ -1,7 +1,7 @@
# This tests the functionality that lld is able to emit
# init_array/fini_array sections in the right order.
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/initfini.o \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/initfini.o \
RUN: --noinhibit-exec -o %t
RUN: llvm-objdump -t -section-headers %t | FileCheck %s
diff --git a/lld/test/elf/X86_64/initfini.test b/lld/test/elf/X86_64/initfini.test
index d882352a1c3..09d2bc129c2 100644
--- a/lld/test/elf/X86_64/initfini.test
+++ b/lld/test/elf/X86_64/initfini.test
@@ -3,7 +3,7 @@
# corresponds to the the .init_array/.fini_array sections
# in the output ELF.
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/initfini.o \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/initfini.o \
RUN: --noinhibit-exec --output-filetype=yaml -o %t
RUN: FileCheck %s < %t
diff --git a/lld/test/elf/X86_64/largebss.test b/lld/test/elf/X86_64/largebss.test
index d2dde495413..722ec1c72bf 100644
--- a/lld/test/elf/X86_64/largebss.test
+++ b/lld/test/elf/X86_64/largebss.test
@@ -3,7 +3,7 @@
# Any typeZeroFill content wouldn't have space reserved in the file to store
# its content
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/largebss.o --output-filetype=yaml --noinhibit-exec | FileCheck %s
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/largebss.o --output-filetype=yaml --noinhibit-exec | FileCheck %s
CHECK: - name: largecommon
CHECK: scope: global
diff --git a/lld/test/elf/X86_64/layoutpass-order.test b/lld/test/elf/X86_64/layoutpass-order.test
index e4ebef1d52d..ec180c970e7 100644
--- a/lld/test/elf/X86_64/layoutpass-order.test
+++ b/lld/test/elf/X86_64/layoutpass-order.test
@@ -1,7 +1,7 @@
# This test checks that we follow the command line order of layouting
# symbols in the output file
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/layoutpass/1.o \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/layoutpass/1.o \
RUN: %p/Inputs/layoutpass/lib2.a %p/Inputs/layoutpass/3.o -o %t \
RUN: --noinhibit-exec -static
diff --git a/lld/test/elf/X86_64/maxpagesize.test b/lld/test/elf/X86_64/maxpagesize.test
index d73c9b2cbbc..303bd86eec0 100644
--- a/lld/test/elf/X86_64/maxpagesize.test
+++ b/lld/test/elf/X86_64/maxpagesize.test
@@ -4,15 +4,15 @@
# Build executable
# RUN: yaml2obj -format=elf -docnum 1 %s -o %t.o
-# RUN: not lld -flavor gnu -target x86_64 %t.o -o %t.exe -static \
+# RUN: not lld -flavor old-gnu -target x86_64 %t.o -o %t.exe -static \
# RUN: --no-align-segments --noinhibit-exec -z max-page-size=0
-# RUN: not lld -flavor gnu -target x86_64 %t.o -o %t.exe -static \
+# RUN: not lld -flavor old-gnu -target x86_64 %t.o -o %t.exe -static \
# RUN: --no-align-segments --noinhibit-exec -z max-page-size=0xFF
-# RUN: not lld -flavor gnu -target x86_64 %t.o -o %t.exe -static \
+# RUN: not lld -flavor old-gnu -target x86_64 %t.o -o %t.exe -static \
# RUN: --no-align-segments --noinhibit-exec -z max-page-size=0x1010
-# RUN: lld -flavor gnu -target x86_64 %t.o -o %t1.exe -static \
+# RUN: lld -flavor old-gnu -target x86_64 %t.o -o %t1.exe -static \
# RUN: --no-align-segments --noinhibit-exec -z max-page-size=0x100000
-# RUN: lld -flavor gnu -target x86_64 %t.o -o %t.exe -static \
+# RUN: lld -flavor old-gnu -target x86_64 %t.o -o %t.exe -static \
# RUN: --no-align-segments --noinhibit-exec -z max-page-size=0x10000
# RUN: llvm-readobj -program-headers %t.exe | FileCheck %s
# RUN: llvm-readobj -program-headers %t1.exe | FileCheck %s -check-prefix=CHECKLARGE
diff --git a/lld/test/elf/X86_64/mergesimilarstrings.test b/lld/test/elf/X86_64/mergesimilarstrings.test
index 3836f0b5075..2b9b08faa23 100644
--- a/lld/test/elf/X86_64/mergesimilarstrings.test
+++ b/lld/test/elf/X86_64/mergesimilarstrings.test
@@ -2,9 +2,9 @@
# when merging strings is enabled.
#
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target x86_64 %t.o --noinhibit-exec -o %t1.out
+# RUN: lld -flavor old-gnu -target x86_64 %t.o --noinhibit-exec -o %t1.out
# RUN: llvm-readobj -sections %t1.out | FileCheck %s
-# RUN: lld -flavor gnu -target x86_64 %t.o --noinhibit-exec -o %t2.out --output-filetype=yaml
+# RUN: lld -flavor old-gnu -target x86_64 %t.o --noinhibit-exec -o %t2.out --output-filetype=yaml
# RUN: FileCheck %s -check-prefix=CHECKRELOCS < %t2.out
FileHeader:
diff --git a/lld/test/elf/X86_64/multi-weak-layout.test b/lld/test/elf/X86_64/multi-weak-layout.test
index 0fd3988db22..879b4b1b305 100644
--- a/lld/test/elf/X86_64/multi-weak-layout.test
+++ b/lld/test/elf/X86_64/multi-weak-layout.test
@@ -1,7 +1,7 @@
# Test that we are able to layout multiple weak symbols
# properly
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/multiweaksyms.o \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/multiweaksyms.o \
RUN: --noinhibit-exec -static --output-filetype=yaml -o %t
RUN: FileCheck %s -check-prefix=WEAKSYMS < %t
diff --git a/lld/test/elf/X86_64/multi-weak-override.test b/lld/test/elf/X86_64/multi-weak-override.test
index f2d0e0c2f77..75c86e7e405 100644
--- a/lld/test/elf/X86_64/multi-weak-override.test
+++ b/lld/test/elf/X86_64/multi-weak-override.test
@@ -1,8 +1,8 @@
# Test for weak symbol getting overridden
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/multi-weak.o \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/multi-weak.o \
RUN: %p/Inputs/multi-ovrd.o -o %t -e main --noinhibit-exec
RUN: llvm-nm -n %t | FileCheck -check-prefix=WEAKORDER %s
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/multi-weak.o \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/multi-weak.o \
RUN: %p/Inputs/multi-ovrd.o --output-filetype=yaml -o %t2 --noinhibit-exec
RUN: FileCheck -check-prefix=WEAKATOMSORDER %s < %t2
diff --git a/lld/test/elf/X86_64/multi-weak-syms-order.test b/lld/test/elf/X86_64/multi-weak-syms-order.test
index 2b414593fed..a8e21e13f87 100644
--- a/lld/test/elf/X86_64/multi-weak-syms-order.test
+++ b/lld/test/elf/X86_64/multi-weak-syms-order.test
@@ -1,7 +1,7 @@
# Test for weak symbol getting overridden
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/multi-weak.o -o %t --noinhibit-exec
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/multi-weak.o -o %t --noinhibit-exec
RUN: llvm-nm -n %t | FileCheck -check-prefix=WEAKORDER %s
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/multi-weak.o -o %t2 --output-filetype=yaml --noinhibit-exec
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/multi-weak.o -o %t2 --output-filetype=yaml --noinhibit-exec
RUN: FileCheck -check-prefix=WEAKATOMSORDER %s < %t2
WEAKORDER: {{[0-9a-f]+}} T fn
diff --git a/lld/test/elf/X86_64/nmagic.test b/lld/test/elf/X86_64/nmagic.test
index b313c1f051b..3ed9228fa78 100644
--- a/lld/test/elf/X86_64/nmagic.test
+++ b/lld/test/elf/X86_64/nmagic.test
@@ -1,7 +1,7 @@
# This tests verifies functionality of NMAGIC that we create only two segments,
# PT_LOAD, PT_TLS
# The data segment should be aligned to a page boundary
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/nmagic.o \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/nmagic.o \
RUN: --noinhibit-exec -o %t --nmagic -static
RUN: llvm-readobj -sections %t | FileCheck -check-prefix=NMAGICSECTIONS %s
RUN: llvm-readobj -program-headers %t | FileCheck -check-prefix=NMAGICPROGRAMHEADERS %s
diff --git a/lld/test/elf/X86_64/noalignsegments.test b/lld/test/elf/X86_64/noalignsegments.test
index 4e6abfe6bb2..4963575b674 100644
--- a/lld/test/elf/X86_64/noalignsegments.test
+++ b/lld/test/elf/X86_64/noalignsegments.test
@@ -3,7 +3,7 @@
# Build executable
# RUN: yaml2obj -format=elf -docnum 1 %s -o %t.o
-# RUN: lld -flavor gnu -target x86_64 %t.o -o %t.exe -static \
+# RUN: lld -flavor old-gnu -target x86_64 %t.o -o %t.exe -static \
# RUN: --no-align-segments --noinhibit-exec
# RUN: llvm-readobj -program-headers %t.exe | FileCheck %s
#
diff --git a/lld/test/elf/X86_64/note-sections-ro_plus_rw.test b/lld/test/elf/X86_64/note-sections-ro_plus_rw.test
index ddeeaa41a75..b4eafaf277c 100644
--- a/lld/test/elf/X86_64/note-sections-ro_plus_rw.test
+++ b/lld/test/elf/X86_64/note-sections-ro_plus_rw.test
@@ -2,7 +2,7 @@
# if they appear in the input, it looks like we need to differentiate RO note
# sections from RW note sections, and each creating a segment of its own
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/note_ro_rw.o \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/note_ro_rw.o \
RUN: --noinhibit-exec -o %t -static
RUN: llvm-readobj -sections %t | FileCheck -check-prefix=NOTESECTIONS %s
RUN: llvm-readobj -program-headers %t | FileCheck -check-prefix=NOTESEGMENT %s
diff --git a/lld/test/elf/X86_64/note-sections.test b/lld/test/elf/X86_64/note-sections.test
index a49f95cf4a2..b831e7e192b 100644
--- a/lld/test/elf/X86_64/note-sections.test
+++ b/lld/test/elf/X86_64/note-sections.test
@@ -1,7 +1,7 @@
# This tests the functionality that lld is able to recreate the note sections
# if they appear in the input
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/note.o \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/note.o \
RUN: --noinhibit-exec -o %t -static
RUN: llvm-readobj -sections %t | FileCheck -check-prefix=NOTESECTIONS %s
RUN: llvm-readobj -program-headers %t | FileCheck -check-prefix=NOTESEGMENT %s
diff --git a/lld/test/elf/X86_64/omagic.test b/lld/test/elf/X86_64/omagic.test
index 270625eb3e8..fe2633e67a9 100644
--- a/lld/test/elf/X86_64/omagic.test
+++ b/lld/test/elf/X86_64/omagic.test
@@ -1,7 +1,7 @@
# This tests verifies functionality of omagic that we create only two segments,
# PT_LOAD, PT_TLS
# The data segment should not be aligned to a page boundary
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/nmagic.o \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/nmagic.o \
RUN: --noinhibit-exec -o %t --omagic -static
RUN: llvm-readobj -sections %t | FileCheck -check-prefix=OMAGICSECTIONS %s
RUN: llvm-readobj -program-headers %t | FileCheck -check-prefix=OMAGICPROGRAMHEADERS %s
diff --git a/lld/test/elf/X86_64/outputsegments.test b/lld/test/elf/X86_64/outputsegments.test
index 5b7ddfdf91f..1c76b6eb855 100644
--- a/lld/test/elf/X86_64/outputsegments.test
+++ b/lld/test/elf/X86_64/outputsegments.test
@@ -3,9 +3,9 @@
# Build executable
# RUN: yaml2obj -format=elf -docnum 1 %s -o %t.o
-# RUN: lld -flavor gnu -target x86_64 %t.o -o %t1.exe -static \
+# RUN: lld -flavor old-gnu -target x86_64 %t.o -o %t1.exe -static \
# RUN: --no-align-segments --noinhibit-exec
-# RUN: lld -flavor gnu -target x86_64 %t.o -o %t2.exe -static \
+# RUN: lld -flavor old-gnu -target x86_64 %t.o -o %t2.exe -static \
# RUN: --noinhibit-exec
# RUN: llvm-readobj -program-headers %t1.exe | FileCheck %s -check-prefix=SEGMENTS
# RUN: llvm-readobj -program-headers %t2.exe | FileCheck %s -check-prefix=SEGMENTS
diff --git a/lld/test/elf/X86_64/reloc_r_x86_64_16.test b/lld/test/elf/X86_64/reloc_r_x86_64_16.test
index 35885c6f779..093fbeb4f13 100644
--- a/lld/test/elf/X86_64/reloc_r_x86_64_16.test
+++ b/lld/test/elf/X86_64/reloc_r_x86_64_16.test
@@ -1,6 +1,6 @@
# Tests that lld can handle relocations of type R_X86_64_16
#RUN: yaml2obj -format=elf -docnum 1 %s -o %t1.o
-#RUN: lld -flavor gnu -target x86_64 %t1.o --noinhibit-exec -o %t2.out -static
+#RUN: lld -flavor old-gnu -target x86_64 %t1.o --noinhibit-exec -o %t2.out -static
#RUN: llvm-objdump -s %t2.out | FileCheck %s
#CHECK: Contents of section .data:
#CHECK: 401000 0210
diff --git a/lld/test/elf/X86_64/reloc_r_x86_64_pc16.test b/lld/test/elf/X86_64/reloc_r_x86_64_pc16.test
index f1cfb7a782f..c6e53ad636e 100644
--- a/lld/test/elf/X86_64/reloc_r_x86_64_pc16.test
+++ b/lld/test/elf/X86_64/reloc_r_x86_64_pc16.test
@@ -1,6 +1,6 @@
# Tests that lld can handle relocations of type R_X86_64_PC16
#RUN: yaml2obj -format=elf -docnum 1 %s -o %t1.o
-#RUN: lld -flavor gnu -target x86_64 %t1.o --noinhibit-exec -o %t2.out -static
+#RUN: lld -flavor old-gnu -target x86_64 %t1.o --noinhibit-exec -o %t2.out -static
#RUN: llvm-objdump -s %t2.out | FileCheck %s
#CHECK: Contents of section .data:
#CHECK: 401000 0700
diff --git a/lld/test/elf/X86_64/reloc_r_x86_64_pc64.test b/lld/test/elf/X86_64/reloc_r_x86_64_pc64.test
index b77ac536213..a7c5e88965c 100644
--- a/lld/test/elf/X86_64/reloc_r_x86_64_pc64.test
+++ b/lld/test/elf/X86_64/reloc_r_x86_64_pc64.test
@@ -1,6 +1,6 @@
# Tests that lld can handle relocations of type R_X86_64_PC64
#RUN: yaml2obj -format=elf -docnum 1 %s -o %t1.o
-#RUN: lld -flavor gnu -target x86_64 %t1.o --noinhibit-exec -o %t2.out -static
+#RUN: lld -flavor old-gnu -target x86_64 %t1.o --noinhibit-exec -o %t2.out -static
#RUN: llvm-objdump -s %t2.out | FileCheck %s
#CHECK: Contents of section .data:
#CHECK: 401000 0a00
diff --git a/lld/test/elf/X86_64/rodata.test b/lld/test/elf/X86_64/rodata.test
index 61af99f65cf..6f85ac0423f 100644
--- a/lld/test/elf/X86_64/rodata.test
+++ b/lld/test/elf/X86_64/rodata.test
@@ -1,7 +1,7 @@
# This tests that the ordinals for all merge atoms and defined atoms have been
# set properly
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/rodata.o --noinhibit-exec \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/rodata.o --noinhibit-exec \
RUN: --merge-strings -static -o %t1
RUN: llvm-nm -n %t1 | FileCheck %s
diff --git a/lld/test/elf/X86_64/sectionchoice.test b/lld/test/elf/X86_64/sectionchoice.test
index 4034d8b1111..7ff838fed98 100644
--- a/lld/test/elf/X86_64/sectionchoice.test
+++ b/lld/test/elf/X86_64/sectionchoice.test
@@ -1,5 +1,5 @@
# This tests that we are able to properly set the sectionChoice for DefinedAtoms
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/zerosizedsection.o \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/zerosizedsection.o \
RUN: --noinhibit-exec -o %t --output-filetype=yaml
RUN: FileCheck %s < %t
diff --git a/lld/test/elf/X86_64/sectionmap.test b/lld/test/elf/X86_64/sectionmap.test
index a38f23e32b9..5fa04bd8705 100644
--- a/lld/test/elf/X86_64/sectionmap.test
+++ b/lld/test/elf/X86_64/sectionmap.test
@@ -1,7 +1,7 @@
# This tests that we are able to merge the section .gcc_except_table,
# .data.rel.local, .data.rel.ro, any other sections that belong to .data
# into appropriate output sections
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/sectionmap.o \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/sectionmap.o \
RUN: --noinhibit-exec -o %t
RUN: llvm-readobj -sections %t | FileCheck %s -check-prefix=VERIFYSECTIONHEADERS
diff --git a/lld/test/elf/X86_64/startGroupEndGroup.test b/lld/test/elf/X86_64/startGroupEndGroup.test
index ce1897683b3..e79e436a651 100644
--- a/lld/test/elf/X86_64/startGroupEndGroup.test
+++ b/lld/test/elf/X86_64/startGroupEndGroup.test
@@ -1,40 +1,40 @@
# This tests functionality of --start-group, --end-group
# This link should fail with unresolve symbol
-RUN: not lld -flavor gnu -target x86_64 %p/Inputs/group/1.o \
+RUN: not lld -flavor old-gnu -target x86_64 %p/Inputs/group/1.o \
RUN: %p/Inputs/group/libfn.a %p/Inputs/group/libfn1.a -o x 2> %t.err
# Test group
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/group/1.o --start-group \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/group/1.o --start-group \
RUN: %p/Inputs/group/libfn.a %p/Inputs/group/libfn1.a --end-group -o %t1
# Mix object files in group
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/group/1.o --start-group \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/group/1.o --start-group \
RUN: %p/Inputs/group/fn.o %p/Inputs/group/fn2.o \
RUN: %p/Inputs/group/fn1.o --end-group -o %t2
# Mix Whole archive input, the group should not iterate the file libfn.a
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/group/1.o --start-group \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/group/1.o --start-group \
RUN: --whole-archive %p/Inputs/group/libfn.a --no-whole-archive \
RUN: %p/Inputs/group/libfn1.a --end-group -o %t3
# Defined symbols in a shared library.
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/group/1.o --start-group \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/group/1.o --start-group \
RUN: %p/Inputs/group/libfn2.so %p/Inputs/group/fn1.o %p/Inputs/group/fn.o \
RUN: --end-group -o %t4
# Test alias options too, as they are more widely used
# Test group
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/group/1.o '-(' \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/group/1.o '-(' \
RUN: %p/Inputs/group/libfn.a %p/Inputs/group/libfn1.a '-)' -o %t1.alias
# Mix object files in group
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/group/1.o '-(' \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/group/1.o '-(' \
RUN: %p/Inputs/group/fn.o %p/Inputs/group/fn2.o \
RUN: %p/Inputs/group/fn1.o '-)' -o %t2.alias
# Mix Whole archive input, the group should not iterate the file libfn.a
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/group/1.o '-(' \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/group/1.o '-(' \
RUN: --whole-archive %p/Inputs/group/libfn.a --no-whole-archive \
RUN: %p/Inputs/group/libfn1.a '-)' -o %t3.alias
diff --git a/lld/test/elf/X86_64/startGroupEndGroupWithDynlib.test b/lld/test/elf/X86_64/startGroupEndGroupWithDynlib.test
index 3e40997db38..30bfe1530f8 100644
--- a/lld/test/elf/X86_64/startGroupEndGroupWithDynlib.test
+++ b/lld/test/elf/X86_64/startGroupEndGroupWithDynlib.test
@@ -1,7 +1,7 @@
# This tests functionality of --start-group, --end-group with a dynamic library
# Mix dynamic libraries/object files in group
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/group/1.o --start-group \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/group/1.o --start-group \
RUN: %p/Inputs/group/libfn.so %p/Inputs/group/fn2.o \
RUN: %p/Inputs/group/fn1.o --end-group -o %t1
diff --git a/lld/test/elf/X86_64/staticlib-search.test b/lld/test/elf/X86_64/staticlib-search.test
index 9c512571932..b84bd299f38 100644
--- a/lld/test/elf/X86_64/staticlib-search.test
+++ b/lld/test/elf/X86_64/staticlib-search.test
@@ -1,5 +1,5 @@
# This tests the functionality for finding the static library libfn.a for ELF
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/main.o -L%p/Inputs/ -lfn -o %t \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/main.o -L%p/Inputs/ -lfn -o %t \
RUN: --noinhibit-exec -static -t 2> %t1
RUN: FileCheck %s < %t1
diff --git a/lld/test/elf/X86_64/undef.test b/lld/test/elf/X86_64/undef.test
index 8f0039a1469..f948286a339 100644
--- a/lld/test/elf/X86_64/undef.test
+++ b/lld/test/elf/X86_64/undef.test
@@ -1,9 +1,9 @@
# This tests the functionality that an undefined symbol thats defined in the
# commmand line pulls in the required object file from the archive library
# which is usually the usecase for it
-RUN: lld -flavor gnu -target x86_64 -u fn %p/Inputs/libfn.a -o %t --noinhibit-exec
+RUN: lld -flavor old-gnu -target x86_64 -u fn %p/Inputs/libfn.a -o %t --noinhibit-exec
RUN: llvm-readobj -symbols %t | FileCheck -check-prefix=SYMFROMARCHIVE %s
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/libfn.a -o %t --noinhibit-exec
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/libfn.a -o %t --noinhibit-exec
RUN: llvm-readobj -symbols %t | FileCheck %s
SYMFROMARCHIVE: Symbol {
diff --git a/lld/test/elf/X86_64/underscore-end.test b/lld/test/elf/X86_64/underscore-end.test
index 337aa197f81..4ca0c94013e 100644
--- a/lld/test/elf/X86_64/underscore-end.test
+++ b/lld/test/elf/X86_64/underscore-end.test
@@ -1,8 +1,8 @@
# This tests verifies that the value of _end symbol is point to the right value
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/nmagic.o \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/nmagic.o \
RUN: --noinhibit-exec -o %t --nmagic
RUN: llvm-readobj -symbols %t | FileCheck -check-prefix=NMAGICABSSYMBOLS %s
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/nmagic.o \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/nmagic.o \
RUN: --noinhibit-exec -o %t --omagic
RUN: llvm-readobj -symbols %t | FileCheck -check-prefix=OMAGICABSSYMBOLS %s
diff --git a/lld/test/elf/X86_64/weak-override.test b/lld/test/elf/X86_64/weak-override.test
index b68b449a664..25cb9d5d687 100644
--- a/lld/test/elf/X86_64/weak-override.test
+++ b/lld/test/elf/X86_64/weak-override.test
@@ -1,8 +1,8 @@
# Test for weak symbol getting overridden
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/weak.o %p/Inputs/ovrd.o \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/weak.o %p/Inputs/ovrd.o \
RUN: -o %t --noinhibit-exec
RUN: llvm-nm %t | FileCheck -check-prefix=WEAKORDER %s
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/weak.o \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/weak.o \
RUN: %p/Inputs/ovrd.o -o %t2 --output-filetype=yaml --noinhibit-exec
RUN: FileCheck -check-prefix=WEAKATOMSORDER %s < %t2
diff --git a/lld/test/elf/X86_64/weak-zero-sized.test b/lld/test/elf/X86_64/weak-zero-sized.test
index e02ba5dcfc5..93e27a355d6 100644
--- a/lld/test/elf/X86_64/weak-zero-sized.test
+++ b/lld/test/elf/X86_64/weak-zero-sized.test
@@ -1,8 +1,8 @@
# Test for zero sized weak atoms, there is only a single weak atom
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/weak-zero-sized.o -o %t \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/weak-zero-sized.o -o %t \
RUN: --noinhibit-exec
RUN: llvm-nm %t | FileCheck -check-prefix=WEAKORDER %s
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/weak-zero-sized.o \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/weak-zero-sized.o \
RUN: --output-filetype=yaml -o %t2 --noinhibit-exec
RUN: FileCheck -check-prefix=WEAKATOMSORDER %s < %t2
diff --git a/lld/test/elf/X86_64/weaksym.test b/lld/test/elf/X86_64/weaksym.test
index 418fbdeaebd..9e4f2da9bdb 100644
--- a/lld/test/elf/X86_64/weaksym.test
+++ b/lld/test/elf/X86_64/weaksym.test
@@ -3,7 +3,7 @@
# symbol.
#RUN: yaml2obj --format elf %s -o %t.o
-#RUN: lld -flavor gnu -target x86_64 -e main %t.o -o %t1
+#RUN: lld -flavor old-gnu -target x86_64 -e main %t.o -o %t1
#RUN: llvm-readobj -dt %t1 | FileCheck -check-prefix CHECKSYMS %s
#CHECKSYMS: Name: x@
diff --git a/lld/test/elf/X86_64/yamlinput.test b/lld/test/elf/X86_64/yamlinput.test
index 6e529b41b7a..1c51811eec9 100644
--- a/lld/test/elf/X86_64/yamlinput.test
+++ b/lld/test/elf/X86_64/yamlinput.test
@@ -1,9 +1,9 @@
# This tests the functionality that lld is able to read
# an input YAML from a previous link
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/initfini.o \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/initfini.o \
RUN: --noinhibit-exec --output-filetype=yaml -o %t.objtxt
-RUN: lld -flavor gnu -target x86_64-linux %t.objtxt \
+RUN: lld -flavor old-gnu -target x86_64-linux %t.objtxt \
RUN: --noinhibit-exec -o %t1
RUN: llvm-readobj -sections %t1 | FileCheck %s -check-prefix=SECTIONS
diff --git a/lld/test/elf/abs-dup.objtxt b/lld/test/elf/abs-dup.objtxt
index 7340a29b0f0..c662c9b44b4 100644
--- a/lld/test/elf/abs-dup.objtxt
+++ b/lld/test/elf/abs-dup.objtxt
@@ -1,5 +1,5 @@
# Tests handling an absolute symbol with no name
-# RUN: lld -flavor gnu -target x86_64 -r %s \
+# RUN: lld -flavor old-gnu -target x86_64 -r %s \
# RUN: --output-filetype=yaml | FileCheck %s
absolute-atoms:
diff --git a/lld/test/elf/abs.test b/lld/test/elf/abs.test
index bad74f10d19..f542582bfa8 100644
--- a/lld/test/elf/abs.test
+++ b/lld/test/elf/abs.test
@@ -9,7 +9,7 @@
# built using: "gcc -m32"
#
-RUN: lld -flavor gnu -target i386 --output-filetype=yaml -r %p/Inputs/abs-test.i386 | FileCheck -check-prefix=YAML %s
+RUN: lld -flavor old-gnu -target i386 --output-filetype=yaml -r %p/Inputs/abs-test.i386 | FileCheck -check-prefix=YAML %s
YAML: absolute-atoms:
YAML: - name: absLocalSymbol
diff --git a/lld/test/elf/allowduplicates.objtxt b/lld/test/elf/allowduplicates.objtxt
index 15e5cdb95b9..b2f263148b6 100644
--- a/lld/test/elf/allowduplicates.objtxt
+++ b/lld/test/elf/allowduplicates.objtxt
@@ -1,12 +1,12 @@
-# RUN: lld -flavor gnu -target x86_64 --allow-multiple-definition %s \
+# RUN: lld -flavor old-gnu -target x86_64 --allow-multiple-definition %s \
# RUN: %p/Inputs/allowduplicates.objtxt \
# RUN: --output-filetype=yaml --noinhibit-exec | FileCheck %s
#
-# RUN: not lld -flavor gnu -target x86_64 %s %p/Inputs/allowduplicates.objtxt \
+# RUN: not lld -flavor old-gnu -target x86_64 %s %p/Inputs/allowduplicates.objtxt \
# RUN: --output-filetype=yaml \
# RUN: --noinhibit-exec 2>&1 | FileCheck -check-prefix=ERROR %s
#
-# RUN: lld -flavor gnu -target x86_64 -z muldefs %s \
+# RUN: lld -flavor old-gnu -target x86_64 -z muldefs %s \
# RUN: %p/Inputs/allowduplicates.objtxt \
# RUN: --noinhibit-exec --output-filetype=yaml | FileCheck %s
diff --git a/lld/test/elf/archive-elf-forceload.test b/lld/test/elf/archive-elf-forceload.test
index a0d11509481..db5ba6cdfaa 100644
--- a/lld/test/elf/archive-elf-forceload.test
+++ b/lld/test/elf/archive-elf-forceload.test
@@ -23,7 +23,7 @@
# }
# gcc -c main.c fn.c fn1.c
-RUN: lld -flavor gnu -target x86_64-linux -e main %p/Inputs/mainobj.x86_64 \
+RUN: lld -flavor old-gnu -target x86_64-linux -e main %p/Inputs/mainobj.x86_64 \
RUN: --whole-archive %p/Inputs/libfnarchive.a --no-whole-archive --output-filetype=yaml \
RUN: | FileCheck -check-prefix FORCELOAD %s
diff --git a/lld/test/elf/archive-elf.test b/lld/test/elf/archive-elf.test
index ba6774644cb..7784eb9279d 100644
--- a/lld/test/elf/archive-elf.test
+++ b/lld/test/elf/archive-elf.test
@@ -23,7 +23,7 @@
# }
# gcc -c main.c fn.c fn1.c
-RUN: lld -flavor gnu -target x86_64-linux --output-filetype=yaml -r \
+RUN: lld -flavor old-gnu -target x86_64-linux --output-filetype=yaml -r \
RUN: %p/Inputs/mainobj.x86_64 %p/Inputs/libfnarchive.a | \
RUN: FileCheck -check-prefix NOFORCELOAD %s
diff --git a/lld/test/elf/as-needed.test b/lld/test/elf/as-needed.test
index 4477f0fe0ca..bcebfbac2f2 100644
--- a/lld/test/elf/as-needed.test
+++ b/lld/test/elf/as-needed.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/use-shared.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/use-shared.x86-64 \
RUN: --as-needed %p/Inputs/shared.so-x86-64 %p/Inputs/libifunc.x86-64.so \
RUN: -o %t1 -e main --allow-shlib-undefined
RUN: llvm-readobj -dynamic-table %t1 | FileCheck %s -check-prefix AS_NEEDED
@@ -6,7 +6,7 @@ RUN: llvm-readobj -dynamic-table %t1 | FileCheck %s -check-prefix AS_NEEDED
AS_NEEDED: NEEDED SharedLibrary (shared.so-x86-64)
AS_NEEDED-NOT: NEEDED SharedLibrary (libifunc.x86-64.so)
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/use-shared.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/use-shared.x86-64 \
RUN: %p/Inputs/shared.so-x86-64 %p/Inputs/libifunc.x86-64.so \
RUN: -o %t2 -e main --allow-shlib-undefined
RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s -check-prefix NO_AS_NEEDED
diff --git a/lld/test/elf/branch.test b/lld/test/elf/branch.test
index 5e0b4a5aabf..116fd0f07c5 100644
--- a/lld/test/elf/branch.test
+++ b/lld/test/elf/branch.test
@@ -1,6 +1,6 @@
-RUN: lld -flavor gnu -target hexagon -static --output-filetype=yaml \
+RUN: lld -flavor old-gnu -target hexagon -static --output-filetype=yaml \
RUN: %p/Inputs/branch-test.hexagon %p/Inputs/target-test.hexagon --noinhibit-exec | FileCheck %s -check-prefix hexagon-yaml
-RUN: lld -flavor gnu -target hexagon -e target -o %t1 \
+RUN: lld -flavor old-gnu -target hexagon -e target -o %t1 \
RUN: %p/Inputs/branch-test.hexagon %p/Inputs/target-test.hexagon --noinhibit-exec
RUN: llvm-readobj -h %t1 | FileCheck -check-prefix=hexagon-readobj %s
diff --git a/lld/test/elf/check.test b/lld/test/elf/check.test
index 336b7fc1335..3fc11728e12 100644
--- a/lld/test/elf/check.test
+++ b/lld/test/elf/check.test
@@ -1,9 +1,9 @@
# This tests the basic functionality of ordering data and functions as they
# appear in the inputs
-RUN: lld -flavor gnu -target i386 -e global_func --noinhibit-exec --output-filetype=yaml \
+RUN: lld -flavor old-gnu -target i386 -e global_func --noinhibit-exec --output-filetype=yaml \
RUN: %p/Inputs/object-test.elf-i386 -o %t
RUN: FileCheck %s -check-prefix ELF-i386 < %t
-RUN: lld -flavor gnu -target hexagon -e global_func --noinhibit-exec --output-filetype=yaml \
+RUN: lld -flavor old-gnu -target hexagon -e global_func --noinhibit-exec --output-filetype=yaml \
RUN: %p/Inputs/object-test.elf-hexagon -o %t1
RUN: FileCheck %s -check-prefix ELF-hexagon < %t1
diff --git a/lld/test/elf/checkrodata.test b/lld/test/elf/checkrodata.test
index fc75657b4af..71304a443b8 100644
--- a/lld/test/elf/checkrodata.test
+++ b/lld/test/elf/checkrodata.test
@@ -1,7 +1,7 @@
-RUN: lld -flavor gnu -target i386 -o %t1 %p/Inputs/rodata-test.i386 --noinhibit-exec
+RUN: lld -flavor old-gnu -target i386 -o %t1 %p/Inputs/rodata-test.i386 --noinhibit-exec
RUN: llvm-objdump -section-headers %t1 | FileCheck -check-prefix=i386 %s
-RUN: lld -flavor gnu -target hexagon -o %t2 %p/Inputs/rodata-test.hexagon --noinhibit-exec
+RUN: lld -flavor old-gnu -target hexagon -o %t2 %p/Inputs/rodata-test.hexagon --noinhibit-exec
RUN: llvm-objdump -section-headers %t2 | FileCheck -check-prefix=hexagon %s
i386: .rodata 00000004 0000000000000114 DATA
diff --git a/lld/test/elf/common.test b/lld/test/elf/common.test
index 46fcfe39d48..e337ac39914 100644
--- a/lld/test/elf/common.test
+++ b/lld/test/elf/common.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target x86_64-linux -o %t %p/Inputs/relocs.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux -o %t %p/Inputs/relocs.x86-64 \
RUN: -e _start -static
RUN: llvm-readobj -t %t | FileCheck %s
diff --git a/lld/test/elf/consecutive-weak-sym-defs.test b/lld/test/elf/consecutive-weak-sym-defs.test
index 095fabb17ab..0120aa12655 100644
--- a/lld/test/elf/consecutive-weak-sym-defs.test
+++ b/lld/test/elf/consecutive-weak-sym-defs.test
@@ -12,7 +12,7 @@
#
#RUN: yaml2obj -format=elf %p/Inputs/consecutive-weak-defs.o.yaml -o=%t1.o
#RUN: yaml2obj -format=elf %p/Inputs/main-with-global-def.o.yaml -o=%t2.o
-#RUN: lld -flavor gnu -target x86_64 %t1.o %t2.o -e=main -o %t1
+#RUN: lld -flavor old-gnu -target x86_64 %t1.o %t2.o -e=main -o %t1
#RUN: obj2yaml %t1 | FileCheck -check-prefix CHECKLAYOUT %s
#
# Check that the layout has not been changed:
diff --git a/lld/test/elf/defsym.objtxt b/lld/test/elf/defsym.objtxt
index f2b3fcf5c00..7fdc20d4dd9 100644
--- a/lld/test/elf/defsym.objtxt
+++ b/lld/test/elf/defsym.objtxt
@@ -1,10 +1,10 @@
-# RUN: lld -flavor gnu -target x86_64 --defsym=foo=0x1234 -r %s \
+# RUN: lld -flavor old-gnu -target x86_64 --defsym=foo=0x1234 -r %s \
# RUN: --output-filetype=yaml | FileCheck -check-prefix=ABS %s
-# RUN: lld -flavor gnu -target x86_64 --defsym=foo=main -r %s \
+# RUN: lld -flavor old-gnu -target x86_64 --defsym=foo=main -r %s \
# RUN: --output-filetype=yaml | FileCheck -check-prefix=ALIAS %s
-# RUN: lld -flavor gnu -target x86_64 --defsym foo=main -r %s \
+# RUN: lld -flavor old-gnu -target x86_64 --defsym foo=main -r %s \
# RUN: --output-filetype=yaml | FileCheck -check-prefix=ALIAS %s
defined-atoms:
diff --git a/lld/test/elf/discard-all.test b/lld/test/elf/discard-all.test
index 0d105945bc3..7fca435008a 100644
--- a/lld/test/elf/discard-all.test
+++ b/lld/test/elf/discard-all.test
@@ -1,7 +1,7 @@
# Test that -x/--discard all works.
#
#RUN: yaml2obj -format=elf %s -o=%t.o
-#RUN: lld -flavor gnu -target x86_64 %t.o -e=main -x -o %t1
+#RUN: lld -flavor old-gnu -target x86_64 %t.o -e=main -x -o %t1
#RUN: llvm-objdump -t %t1 | FileCheck %s
#CHECK-NOT: 0000000000400210 l F .text 00000009 local
diff --git a/lld/test/elf/discard-locals.test b/lld/test/elf/discard-locals.test
index 6adcd6f348f..d1a0918949a 100644
--- a/lld/test/elf/discard-locals.test
+++ b/lld/test/elf/discard-locals.test
@@ -1,7 +1,7 @@
# Test that -X/--discard-locals works.
#
#RUN: yaml2obj -format=elf %s -o=%t.o
-#RUN: lld -flavor gnu -target x86_64 %t.o -shared -X -o %t1
+#RUN: lld -flavor old-gnu -target x86_64 %t.o -shared -X -o %t1
#RUN: llvm-objdump -t %t1 | FileCheck %s
#CHECK-NOT: 0000000000400121 l .rodata 00000000 .Lsym8
diff --git a/lld/test/elf/dynamic-segorder.test b/lld/test/elf/dynamic-segorder.test
index 1fdccec9921..e9143d83f0f 100644
--- a/lld/test/elf/dynamic-segorder.test
+++ b/lld/test/elf/dynamic-segorder.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/tls.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/tls.x86-64 \
RUN: %p/Inputs/shared.so-x86-64 -o %t -e main --allow-shlib-undefined \
RUN: --defsym=__tls_get_addr=0
RUN: llvm-objdump -p %t | FileCheck %s
diff --git a/lld/test/elf/dynamic-undef.test b/lld/test/elf/dynamic-undef.test
index e803ec1a758..fc661684b19 100644
--- a/lld/test/elf/dynamic-undef.test
+++ b/lld/test/elf/dynamic-undef.test
@@ -4,28 +4,28 @@
#
# This test will fail because there are unresolved symbols from the shared
# library and we are passing --no-allow-shlib-undefined
-RUN: not lld -flavor gnu -target x86_64-linux %p/Inputs/tls.x86-64 \
+RUN: not lld -flavor old-gnu -target x86_64-linux %p/Inputs/tls.x86-64 \
RUN: %p/Inputs/shared.so-x86-64 -o %t -e main --no-allow-shlib-undefined 2> %t1
RUN: FileCheck -check-prefix=EXEC %s < %t1
# This test will pass because of --allow-shlib-undefined
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/tls.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/tls.x86-64 \
RUN: %p/Inputs/shared.so-x86-64 -o %t -e main --allow-shlib-undefined \
RUN: --defsym=__tls_get_addr=0
# This test will pass becase --allow-shlib-undefined is the default.
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/tls.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/tls.x86-64 \
RUN: %p/Inputs/shared.so-x86-64 -o %t -e main \
RUN: --defsym=__tls_get_addr=0
# Building shared libraries should not fail when there is a undefined symbol.
# Test creation of shared library, this should pass because we are using
# shared option and by default, dynamic library wouldn't create undefined atoms
# from the input shared library
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/tls.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/tls.x86-64 \
RUN: %p/Inputs/shared.so-x86-64 -o %t.usenoundefines -e main -shared
RUN: llvm-readobj -symbols %t.usenoundefines | FileCheck %s -check-prefix=SHLIB-NOUNDEF
# Test creation of shared library, this should fail because we are using
# shared option setting the options to use the shared library undefines to
# create undefined atoms from the input shared library
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/tls.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/tls.x86-64 \
RUN: %p/Inputs/shared.so-x86-64 -o %t.useundefines -e main -shared \
RUN: --use-shlib-undefines --no-allow-shlib-undefined 2> %t2
RUN: llvm-readobj -symbols %t.useundefines | FileCheck -check-prefix=SHLIB-UNDEF-SYMBOLS %s
diff --git a/lld/test/elf/dynamic.test b/lld/test/elf/dynamic.test
index 59269612cf8..2b548a7aaf5 100644
--- a/lld/test/elf/dynamic.test
+++ b/lld/test/elf/dynamic.test
@@ -1,8 +1,8 @@
# Checks functionality of dynamic executables
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/use-shared.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/use-shared.x86-64 \
RUN: %p/Inputs/shared.so-x86-64 -o %t -e main --allow-shlib-undefined \
RUN: -rpath /l1:/l2 -rpath /l3
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/use-shared.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/use-shared.x86-64 \
RUN: %p/Inputs/shared.so-x86-64 --output-filetype=yaml -o %t2 --allow-shlib-undefined \
RUN: --noinhibit-exec
RUN: llvm-objdump -p %t >> %t2
diff --git a/lld/test/elf/eh_frame_hdr.test b/lld/test/elf/eh_frame_hdr.test
index 31429857ec6..74383b8dbc5 100644
--- a/lld/test/elf/eh_frame_hdr.test
+++ b/lld/test/elf/eh_frame_hdr.test
@@ -1,5 +1,5 @@
#RUN: yaml2obj -format=elf %s > %t
-#RUN: lld -flavor gnu -target x86_64-linux %t --noinhibit-exec \
+#RUN: lld -flavor old-gnu -target x86_64-linux %t --noinhibit-exec \
#RUN: -o %t1
#RUN: llvm-objdump -s %t1 | FileCheck %s
diff --git a/lld/test/elf/entry.objtxt b/lld/test/elf/entry.objtxt
index 400a89ffb3c..6590d139c41 100644
--- a/lld/test/elf/entry.objtxt
+++ b/lld/test/elf/entry.objtxt
@@ -8,7 +8,7 @@
# }
#
-# RUN: lld -flavor gnu -target x86_64 %s -e _entrypoint --noinhibit-exec -o %t1
+# RUN: lld -flavor old-gnu -target x86_64 %s -e _entrypoint --noinhibit-exec -o %t1
# RUN: llvm-nm -n %t1 | FileCheck %s
#
# CHECK: U _entrypoint
diff --git a/lld/test/elf/export-dynamic.test b/lld/test/elf/export-dynamic.test
index ca02484b76d..b88961597ea 100644
--- a/lld/test/elf/export-dynamic.test
+++ b/lld/test/elf/export-dynamic.test
@@ -3,7 +3,7 @@
# its dynamic symbol table.
#RUN: yaml2obj -format=elf %s -o=%t.o
-#RUN: lld -flavor gnu -target x86_64 -E %t.o -e=main -o %t1
+#RUN: lld -flavor old-gnu -target x86_64 -E %t.o -e=main -o %t1
#RUN: llvm-readobj -dt %t1 | FileCheck -check-prefix CHECKSYMS %s
#CHECKSYMS: myfunc1@
diff --git a/lld/test/elf/filenotfound.test b/lld/test/elf/filenotfound.test
index d64568f2ea5..5020e9cf9b7 100644
--- a/lld/test/elf/filenotfound.test
+++ b/lld/test/elf/filenotfound.test
@@ -1,3 +1,3 @@
# Check that a file that cannot be found results in a proper error message
-RUN: not lld -flavor gnu -target x86_64 %p/Inputs/nofile.o 2>&1 | FileCheck %s
+RUN: not lld -flavor old-gnu -target x86_64 %p/Inputs/nofile.o 2>&1 | FileCheck %s
#CHECK: lld: cannot find file {{.+[\\/]}}nofile.o
diff --git a/lld/test/elf/gnulinkonce/gnulinkonce-report-discarded-reference.test b/lld/test/elf/gnulinkonce/gnulinkonce-report-discarded-reference.test
index 4425990041f..c05a06fab32 100644
--- a/lld/test/elf/gnulinkonce/gnulinkonce-report-discarded-reference.test
+++ b/lld/test/elf/gnulinkonce/gnulinkonce-report-discarded-reference.test
@@ -15,9 +15,9 @@
# .long foo
#RUN: yaml2obj -format=elf -docnum 1 %s -o %t.linkonce1a.o
#RUN: yaml2obj -format=elf -docnum 2 %s -o %t.linkonce1b.o
-#RUN: lld -flavor gnu -target x86_64 %t.linkonce1a.o %t.linkonce1b.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.linkonce1a.o %t.linkonce1b.o \
#RUN: --noinhibit-exec --output-filetype=yaml -o %t2.out.yaml
-#RUN: lld -flavor gnu -target x86_64 %t.linkonce1a.o %t.linkonce1b.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.linkonce1a.o %t.linkonce1b.o \
#RUN: --noinhibit-exec -o %t2.out
#RUN: FileCheck %s -check-prefix=CHECKGNULINKONCE < %t2.out.yaml
#RUN: llvm-readobj -sections %t2.out | FileCheck %s -check-prefix=CHECKGNULINKONCESECTIONS
diff --git a/lld/test/elf/gnulinkonce/gnulinkonce-report-undef.test b/lld/test/elf/gnulinkonce/gnulinkonce-report-undef.test
index 0b516149888..f91123f0efa 100644
--- a/lld/test/elf/gnulinkonce/gnulinkonce-report-undef.test
+++ b/lld/test/elf/gnulinkonce/gnulinkonce-report-undef.test
@@ -14,10 +14,10 @@
# .long foo
#RUN: yaml2obj -format=elf -docnum 1 %s -o %t.linkonce1a.o
#RUN: yaml2obj -format=elf -docnum 2 %s -o %t.linkonce1b.o
-#RUN: not lld -flavor gnu -target x86_64 %t.linkonce1a.o %t.linkonce1b.o \
+#RUN: not lld -flavor old-gnu -target x86_64 %t.linkonce1a.o %t.linkonce1b.o \
#RUN: --output-filetype=yaml -o %t2.out.yaml 2>&1 | FileCheck \
#RUN: -check-prefix=UNDEFS %s
-#RUN: not lld -flavor gnu -target x86_64 %t.linkonce1a.o %t.linkonce1b.o \
+#RUN: not lld -flavor old-gnu -target x86_64 %t.linkonce1a.o %t.linkonce1b.o \
#RUN: -o %t2.out 2>&1 | FileCheck -check-prefix=UNDEFS %s
#UNDEFS: Undefined symbol: {{.*}} foo
---
diff --git a/lld/test/elf/gnulinkonce/gnulinkonce.test b/lld/test/elf/gnulinkonce/gnulinkonce.test
index 5441b0d9caa..eacd41d6ded 100644
--- a/lld/test/elf/gnulinkonce/gnulinkonce.test
+++ b/lld/test/elf/gnulinkonce/gnulinkonce.test
@@ -24,9 +24,9 @@
# .long 0
#RUN: yaml2obj -format=elf -docnum 1 %s -o %t.linkonce1a.o
#RUN: yaml2obj -format=elf -docnum 2 %s -o %t.linkonce1b.o
-#RUN: lld -flavor gnu -target x86_64 %t.linkonce1a.o %t.linkonce1b.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.linkonce1a.o %t.linkonce1b.o \
#RUN: --noinhibit-exec --output-filetype=yaml -o %t2.out.yaml
-#RUN: lld -flavor gnu -target x86_64 %t.linkonce1a.o %t.linkonce1b.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.linkonce1a.o %t.linkonce1b.o \
#RUN: --noinhibit-exec -o %t2.out
#RUN: FileCheck %s -check-prefix=CHECKGNULINKONCE < %t2.out.yaml
#RUN: llvm-readobj -sections %t2.out | FileCheck %s -check-prefix=CHECKGNULINKONCESECTIONS
diff --git a/lld/test/elf/gotpcrel.test b/lld/test/elf/gotpcrel.test
index b6f83c16676..b8695f1aedf 100644
--- a/lld/test/elf/gotpcrel.test
+++ b/lld/test/elf/gotpcrel.test
@@ -1,5 +1,5 @@
# This test checks that GOTPCREL entries are being handled properly
-RUN: lld -flavor gnu -target x86_64-linux -static -e main --output-filetype=yaml \
+RUN: lld -flavor old-gnu -target x86_64-linux -static -e main --output-filetype=yaml \
RUN: --noinhibit-exec %p/Inputs/gotpcrel.x86-64 \
RUN: | FileCheck %s -check-prefix=YAML
diff --git a/lld/test/elf/gottpoff.test b/lld/test/elf/gottpoff.test
index 71304a5b577..969874e538a 100644
--- a/lld/test/elf/gottpoff.test
+++ b/lld/test/elf/gottpoff.test
@@ -3,7 +3,7 @@
# Reference: Ulrich Drepper's "ELF Handling for Thread-Local storage"
#RUN: yaml2obj -format=elf %s -o %t.o
-#RUN: lld -flavor gnu -target x86_64 %t.o -o %t -e=main --defsym=__tls_get_addr=0
+#RUN: lld -flavor old-gnu -target x86_64 %t.o -o %t -e=main --defsym=__tls_get_addr=0
#RUN: llvm-readobj -r %t | FileCheck %s
#
#CHECK: Section (5) .rela.dyn {
diff --git a/lld/test/elf/group-cmd-search.test b/lld/test/elf/group-cmd-search.test
index 5e153c1ac1a..1d7f5ee4336 100644
--- a/lld/test/elf/group-cmd-search.test
+++ b/lld/test/elf/group-cmd-search.test
@@ -31,7 +31,7 @@
This link should finish successfully. The --start-group/--end-group
contains an existing absolute path to the file.
-RUN: lld -flavor gnu -target x86_64 -shared \
+RUN: lld -flavor old-gnu -target x86_64 -shared \
RUN: -L%p/Inputs %p/Inputs/use-shared.x86-64 \
RUN: --start-group %p/Inputs/shared.so-x86-64 --end-group -o %t1
*/
@@ -41,7 +41,7 @@ RUN: --start-group %p/Inputs/shared.so-x86-64 --end-group -o %t1
There is no shared.so-x86-64 file in the current directory.
RUN: not \
-RUN: lld -flavor gnu -target x86_64 -shared \
+RUN: lld -flavor old-gnu -target x86_64 -shared \
RUN: -L%p/Inputs %p/Inputs/use-shared.x86-64 \
RUN: --start-group shared.so-x86-64 --end-group -o %t2
*/
@@ -52,7 +52,7 @@ RUN: --start-group shared.so-x86-64 --end-group -o %t2
should not attempt to search it under the sysroot directory.
RUN: not \
-RUN: lld -flavor gnu -target x86_64 -shared --sysroot=%p/Inputs \
+RUN: lld -flavor old-gnu -target x86_64 -shared --sysroot=%p/Inputs \
RUN: -L%p/Inputs %p/Inputs/use-shared.x86-64 \
RUN: --start-group /shared.so-x86-64 --end-group -o %t3
*/
@@ -62,7 +62,7 @@ RUN: --start-group /shared.so-x86-64 --end-group -o %t3
script contains "GROUP ( shared.so-x86-64 )" command and the linker
has to search shared.so-x86-64 through the library search paths.
-RUN: lld -flavor gnu -target x86_64 -shared \
+RUN: lld -flavor old-gnu -target x86_64 -shared \
RUN: -L%p/Inputs %p/Inputs/use-shared.x86-64 \
RUN: %p/Inputs/group-cmd-search-1.ls -o %t4
*/
@@ -73,7 +73,7 @@ RUN: %p/Inputs/group-cmd-search-1.ls -o %t4
a non-existing absolute path but there is no --sysroot argument.
RUN: not \
-RUN: lld -flavor gnu -target x86_64 -shared \
+RUN: lld -flavor old-gnu -target x86_64 -shared \
RUN: -L%p/Inputs %p/Inputs/use-shared.x86-64 \
RUN: %p/Inputs/group-cmd-search-2.ls -o %t5
*/
@@ -84,7 +84,7 @@ RUN: %p/Inputs/group-cmd-search-2.ls -o %t5
directory is provided. The linker has to search the absolute path
under the sysroot directory.
-RUN: lld -flavor gnu -target x86_64 -shared --sysroot=%p/Inputs \
+RUN: lld -flavor old-gnu -target x86_64 -shared --sysroot=%p/Inputs \
RUN: -L%p/Inputs %p/Inputs/use-shared.x86-64 \
RUN: %p/Inputs/group-cmd-search-2.ls -o %t6
*/
@@ -95,7 +95,7 @@ RUN: %p/Inputs/group-cmd-search-2.ls -o %t6
directory is provided. The linker has to search the absolute path
under the sysroot directory.
-RUN: lld -flavor gnu -target x86_64 -shared --sysroot=%p/Inputs/../Inputs \
+RUN: lld -flavor old-gnu -target x86_64 -shared --sysroot=%p/Inputs/../Inputs \
RUN: -L%p/Inputs %p/Inputs/use-shared.x86-64 \
RUN: %p/Inputs/group-cmd-search-2.ls -o %t6
*/
@@ -108,7 +108,7 @@ RUN: %p/Inputs/group-cmd-search-2.ls -o %t6
has a -l<lib name> form and should be found by constructing a full
library name lib<lib name>.a and iterating through lib dirs.
-RUN: lld -flavor gnu -target x86_64 -shared \
+RUN: lld -flavor old-gnu -target x86_64 -shared \
RUN: -L%p/Inputs %p/Inputs/use-shared.x86-64 \
RUN: %p/Inputs/group-cmd-search-3.ls -o %t8
*/
@@ -120,13 +120,13 @@ RUN: %p/Inputs/group-cmd-search-3.ls -o %t8
But the linker script itself is not under the sysroot.
RUN: not \
-RUN: lld -flavor gnu -target x86_64 -shared --sysroot=%p/Inputs \
+RUN: lld -flavor old-gnu -target x86_64 -shared --sysroot=%p/Inputs \
RUN: -L%p/Inputs %p/Inputs/use-shared.x86-64 \
RUN: %s -o %t7
*/
/*
-RUN: lld -flavor gnu -target x86_64 -shared \
+RUN: lld -flavor old-gnu -target x86_64 -shared \
RUN: -L%p/Inputs %p/Inputs/use-shared.x86-64 \
RUN: -l:group-cmd-search-1.ls -o %t9
*/
diff --git a/lld/test/elf/hexagon-quickdata-sort.test b/lld/test/elf/hexagon-quickdata-sort.test
index efdf9480923..98488b75ceb 100644
--- a/lld/test/elf/hexagon-quickdata-sort.test
+++ b/lld/test/elf/hexagon-quickdata-sort.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target hexagon %p/Inputs/quickdata-sort-test.o.elf-hexagon -o %t1 --noinhibit-exec
+RUN: lld -flavor old-gnu -target hexagon %p/Inputs/quickdata-sort-test.o.elf-hexagon -o %t1 --noinhibit-exec
RUN: llvm-nm -n %t1 | FileCheck %s -check-prefix=quickdataSort
quickdataSort: 00002000 D A1
diff --git a/lld/test/elf/hexagon-quickdata-sortcommon.test b/lld/test/elf/hexagon-quickdata-sortcommon.test
index 5b4690b43cb..d4d7d6a617e 100644
--- a/lld/test/elf/hexagon-quickdata-sortcommon.test
+++ b/lld/test/elf/hexagon-quickdata-sortcommon.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target hexagon -o %t1 --noinhibit-exec \
+RUN: lld -flavor old-gnu -target hexagon -o %t1 --noinhibit-exec \
RUN: %p/Inputs/quickdata-sortcommon-test.o.elf-hexagon
RUN: llvm-nm -n %t1 | FileCheck %s -check-prefix=quickdataSortCommon
diff --git a/lld/test/elf/ifunc.test b/lld/test/elf/ifunc.test
index c567c554cbb..0aa317a24e6 100644
--- a/lld/test/elf/ifunc.test
+++ b/lld/test/elf/ifunc.test
@@ -2,20 +2,20 @@
# This test checks that IRELATIVE relocations are created for symbols that
# need relocation even for static links.
-RUN: lld -flavor gnu -target x86_64-linux --output-filetype=yaml -r \
+RUN: lld -flavor old-gnu -target x86_64-linux --output-filetype=yaml -r \
RUN: %p/Inputs/ifunc.x86-64 | FileCheck %s
-RUN: lld -flavor gnu -target x86_64-linux --output-filetype=yaml --noinhibit-exec \
+RUN: lld -flavor old-gnu -target x86_64-linux --output-filetype=yaml --noinhibit-exec \
RUN: %p/Inputs/ifunc.x86-64 %p/Inputs/ifunc.cpp.x86-64 \
RUN: | FileCheck %s --check-prefix=PLT
-RUN: lld -flavor gnu -target x86_64-linux -o %t %p/Inputs/ifunc.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux -o %t %p/Inputs/ifunc.x86-64 \
RUN: -e main -static %p/Inputs/ifunc.cpp.x86-64
RUN: llvm-objdump -d -s %t| FileCheck %s --check-prefix=BIN
RUN: llvm-readobj -r %t | FileCheck %s --check-prefix=RELATIVEADDEND
# Test that STT_GNU_IFUNC symbols have type Code in SharedLibraryAtom.
-RUN: lld -flavor gnu -target x86_64-linux --output-filetype=yaml \
+RUN: lld -flavor old-gnu -target x86_64-linux --output-filetype=yaml \
RUN: --noinhibit-exec %p/Inputs/ifunc.cpp.x86-64 -L%p/Inputs -lifunc.x86-64 \
RUN: | FileCheck %s --check-prefix=SHARED
diff --git a/lld/test/elf/ignore-unknownoption.test b/lld/test/elf/ignore-unknownoption.test
index 56856ed9f2e..aa03a2eb4e7 100644
--- a/lld/test/elf/ignore-unknownoption.test
+++ b/lld/test/elf/ignore-unknownoption.test
@@ -1,5 +1,5 @@
# This test tests that lld is able to print unknown options that are not
# recognized.
-RUN: not lld -flavor gnu -target x86_64 --gc-sections 2> %t
+RUN: not lld -flavor old-gnu -target x86_64 --gc-sections 2> %t
RUN: FileCheck %s < %t
CHECK: warning: ignoring unknown argument: --gc-sections
diff --git a/lld/test/elf/init_array-order.test b/lld/test/elf/init_array-order.test
index b57b3807b69..2b8bcb65c3e 100644
--- a/lld/test/elf/init_array-order.test
+++ b/lld/test/elf/init_array-order.test
@@ -1,5 +1,5 @@
#RUN: yaml2obj -format=elf %s > %t
-#RUN: lld -flavor gnu -target x86_64-linux %t --noinhibit-exec \
+#RUN: lld -flavor old-gnu -target x86_64-linux %t --noinhibit-exec \
#RUN: -o %t1.out
#RUN: llvm-objdump -s %t1.out | FileCheck %s
diff --git a/lld/test/elf/init_array.test b/lld/test/elf/init_array.test
index 41f69142020..f7f48445621 100644
--- a/lld/test/elf/init_array.test
+++ b/lld/test/elf/init_array.test
@@ -17,7 +17,7 @@
# specially for C++ global constructors).
#RUN: yaml2obj -format=elf %s -o=%t.o
-#RUN: lld -flavor gnu -target x86_64 %t.o -o %t -e=main
+#RUN: lld -flavor old-gnu -target x86_64 %t.o -o %t -e=main
#RUN: llvm-objdump -t -section-headers %t | FileCheck %s
#CHECK: .init_array {{[0-9]+}} [[ADDR:[0-9]+]]
diff --git a/lld/test/elf/initfini-options.test-1.test b/lld/test/elf/initfini-options.test-1.test
index 2fc1c3e32bd..f8571a63719 100644
--- a/lld/test/elf/initfini-options.test-1.test
+++ b/lld/test/elf/initfini-options.test-1.test
@@ -2,7 +2,7 @@
# are undefined the linker does not emit DT_INIT/DT_FINI tags.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target x86_64 -shared --noinhibit-exec -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target x86_64 -shared --noinhibit-exec -o %t.so %t.o
# RUN: llvm-readobj -dynamic-table %t.so | FileCheck %s
# CHECK-NOT: 0x000000000000000C INIT 0x{{[0-9A-F]+}}
diff --git a/lld/test/elf/initfini-options.test-2.test b/lld/test/elf/initfini-options.test-2.test
index 4742084c513..35361c76d97 100644
--- a/lld/test/elf/initfini-options.test-2.test
+++ b/lld/test/elf/initfini-options.test-2.test
@@ -2,7 +2,7 @@
# DT_INIT/DT_FINI tags point to these symbols.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target x86_64 -shared -o %t.so %t.o
+# RUN: lld -flavor old-gnu -target x86_64 -shared -o %t.so %t.o
# RUN: llvm-readobj -symbols -dynamic-table %t.so | FileCheck %s
# CHECK: Name: _init (8)
diff --git a/lld/test/elf/initfini-options.test-3.test b/lld/test/elf/initfini-options.test-3.test
index bf8b216775d..2c9ab3cceb9 100644
--- a/lld/test/elf/initfini-options.test-3.test
+++ b/lld/test/elf/initfini-options.test-3.test
@@ -2,7 +2,7 @@
# and the linker uses these name to search symbols and setup DT_INIT/DT_FINI.
# RUN: yaml2obj -format=elf %s > %t.o
-# RUN: lld -flavor gnu -target x86_64 -shared -o %t.so %t.o \
+# RUN: lld -flavor old-gnu -target x86_64 -shared -o %t.so %t.o \
# RUN: -init _init -init _start -fini _fini -fini _stop
# RUN: llvm-readobj -symbols -dynamic-table %t.so | FileCheck %s
diff --git a/lld/test/elf/librarynotfound.test b/lld/test/elf/librarynotfound.test
index faa1728b478..9b1b8f2cffc 100644
--- a/lld/test/elf/librarynotfound.test
+++ b/lld/test/elf/librarynotfound.test
@@ -1,5 +1,5 @@
# Tests the functionality of library not found
-RUN: not lld -flavor gnu -lfn 2> %t1
+RUN: not lld -flavor old-gnu -lfn 2> %t1
RUN: FileCheck %s < %t1
CHECK: Unable to find library -lfn
diff --git a/lld/test/elf/linkerscript/externs.objtxt b/lld/test/elf/linkerscript/externs.objtxt
index b4c54770ce5..d79c56a142c 100644
--- a/lld/test/elf/linkerscript/externs.objtxt
+++ b/lld/test/elf/linkerscript/externs.objtxt
@@ -1,7 +1,7 @@
# Check symbols defined with the EXTERN command are added as undefined
# symbols.
-# RUN: lld -flavor gnu -target x86_64 -T %p/Inputs/externs.ls -r %s \
+# RUN: lld -flavor old-gnu -target x86_64 -T %p/Inputs/externs.ls -r %s \
# RUN: --output-filetype=yaml | FileCheck %s
defined-atoms:
diff --git a/lld/test/elf/linkerscript/filename-with-wildcards.test b/lld/test/elf/linkerscript/filename-with-wildcards.test
index da06b221c5f..9376d5a5cfb 100644
--- a/lld/test/elf/linkerscript/filename-with-wildcards.test
+++ b/lld/test/elf/linkerscript/filename-with-wildcards.test
@@ -19,7 +19,7 @@ RUN: yaml2obj -format=elf %p/Inputs/prog2.o.yaml -o=%T/p2-wc.o
RUN: yaml2obj -format=elf %p/Inputs/prog3.o.yaml -o=%T/p3-wc.o
RUN: cd %T
-RUN: lld -flavor gnu -target x86_64 -T %s p1-wc.o p2-wc.o p3-wc.o \
+RUN: lld -flavor old-gnu -target x86_64 -T %s p1-wc.o p2-wc.o p3-wc.o \
RUN: -static -o %t1
RUN: llvm-readobj -s %t1 | FileCheck -check-prefix CHECKSECTIONS %s
diff --git a/lld/test/elf/linkerscript/invalid-script-cli-1.test b/lld/test/elf/linkerscript/invalid-script-cli-1.test
index 904ba17557c..72d2edebb4d 100644
--- a/lld/test/elf/linkerscript/invalid-script-cli-1.test
+++ b/lld/test/elf/linkerscript/invalid-script-cli-1.test
@@ -1,10 +1,10 @@
# Check that the -T/--script options issue an error when passed
# filenames for files that do not exist.
-RUN: not lld -flavor gnu -target x86_64 -T idonotexist.ls 2> %t.err
+RUN: not lld -flavor old-gnu -target x86_64 -T idonotexist.ls 2> %t.err
RUN: FileCheck %s < %t.err
-RUN: not lld -flavor gnu -target x86_64 --script=idonotexist.ls 2> %t.err
+RUN: not lld -flavor old-gnu -target x86_64 --script=idonotexist.ls 2> %t.err
RUN: FileCheck %s < %t.err
CHECK: {{.*}}lld: cannot find file {{.*}}idonotexist.ls
diff --git a/lld/test/elf/linkerscript/invalid-script-cli-2.test b/lld/test/elf/linkerscript/invalid-script-cli-2.test
index 6e0e42adc71..cc76f0e55a8 100644
--- a/lld/test/elf/linkerscript/invalid-script-cli-2.test
+++ b/lld/test/elf/linkerscript/invalid-script-cli-2.test
@@ -1,6 +1,6 @@
# Check that linker script are *not* picked up with -lscript.ls.
-RUN: not lld -flavor gnu -target x86_64 -L%p/Inputs/ -lvalid.ls 2> %t.err
+RUN: not lld -flavor old-gnu -target x86_64 -L%p/Inputs/ -lvalid.ls 2> %t.err
RUN: FileCheck %s < %t.err
CHECK: {{.*}}: Unable to find library -lvalid.ls
diff --git a/lld/test/elf/linkerscript/invalid.test b/lld/test/elf/linkerscript/invalid.test
index 42833a6664f..a00a200225d 100644
--- a/lld/test/elf/linkerscript/invalid.test
+++ b/lld/test/elf/linkerscript/invalid.test
@@ -1,5 +1,5 @@
# Check for errors from invalid linker scripts
-RUN: not lld -flavor gnu -target x86_64 %p/Inputs/invalid.ls 2> %t.err
+RUN: not lld -flavor old-gnu -target x86_64 %p/Inputs/invalid.ls 2> %t.err
RUN: FileCheck %s < %t.err
CHECK: {{.*}}invalid.ls: Error parsing linker script
diff --git a/lld/test/elf/linkerscript/phdrs-all-none.test b/lld/test/elf/linkerscript/phdrs-all-none.test
index 199fee5c9ea..45baf188d8d 100644
--- a/lld/test/elf/linkerscript/phdrs-all-none.test
+++ b/lld/test/elf/linkerscript/phdrs-all-none.test
@@ -3,7 +3,7 @@ Test when all segments are marked as NONE.
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
-RUN: lld -flavor gnu -target x86_64 -T %s %t.o -static -o %t1
+RUN: lld -flavor old-gnu -target x86_64 -T %s %t.o -static -o %t1
RUN: llvm-objdump -section-headers %t1 | FileCheck -check-prefix NONE-ALL-PHDRS %s
*/
diff --git a/lld/test/elf/linkerscript/phdrs-custom-none.test b/lld/test/elf/linkerscript/phdrs-custom-none.test
index 1c1029788c8..e3672cf8fd3 100644
--- a/lld/test/elf/linkerscript/phdrs-custom-none.test
+++ b/lld/test/elf/linkerscript/phdrs-custom-none.test
@@ -3,7 +3,7 @@ Test when PHDRS contains custom NONE segment.
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
-RUN: lld -flavor gnu -target x86_64 -T %s %t.o -static -o %t1
+RUN: lld -flavor old-gnu -target x86_64 -T %s %t.o -static -o %t1
RUN: llvm-objdump -section-headers %t1 | FileCheck -check-prefix CUSTOM-NONE-SECS %s
RUN: llvm-readobj -program-headers %t1 | FileCheck -check-prefix CUSTOM-NONE-HDRS %s
*/
diff --git a/lld/test/elf/linkerscript/phdrs-default.test b/lld/test/elf/linkerscript/phdrs-default.test
index 77a40df5081..8c493d02050 100644
--- a/lld/test/elf/linkerscript/phdrs-default.test
+++ b/lld/test/elf/linkerscript/phdrs-default.test
@@ -38,7 +38,7 @@ RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
/*
Test when no linker script passed.
-RUN: lld -flavor gnu -target x86_64 %t.o -static -o %t1
+RUN: lld -flavor old-gnu -target x86_64 %t.o -static -o %t1
RUN: llvm-objdump -section-headers %t1 | FileCheck -check-prefix SECTIONS %s
RUN: llvm-readobj -program-headers %t1 | FileCheck -check-prefix HEADERS %s
@@ -58,7 +58,7 @@ HEADERS: }
/*
Test when linker script doesn't contain PHDRS and sections are not assigned to any segments.
-RUN: lld -flavor gnu -target x86_64 -T %p/phdrs/sections-no-phdrs.script %t.o -static -o %t2
+RUN: lld -flavor old-gnu -target x86_64 -T %p/phdrs/sections-no-phdrs.script %t.o -static -o %t2
RUN: llvm-objdump -section-headers %t2 | FileCheck -check-prefix SECTIONS %s
RUN: llvm-readobj -program-headers %t2 | FileCheck -check-prefix HEADERS %s
*/
@@ -66,7 +66,7 @@ RUN: llvm-readobj -program-headers %t2 | FileCheck -check-prefix HEADERS %s
/*
Test when linker script contains empty PHDRS and sections are not assigned to any segments.
-RUN: lld -flavor gnu -target x86_64 -T %p/phdrs/sections-empty-phdrs.script %t.o -static -o %t3
+RUN: lld -flavor old-gnu -target x86_64 -T %p/phdrs/sections-empty-phdrs.script %t.o -static -o %t3
RUN: llvm-objdump -section-headers %t3 | FileCheck -check-prefix SECTIONS %s
RUN: llvm-readobj -program-headers %t3 | FileCheck -check-prefix HEADERS %s
*/
@@ -76,7 +76,7 @@ Test when linker script contains empty PHDRS and sections are only assigned to N
or not assigned at all.
NOTE: Segments with the name NONE are ignored in such a case.
-RUN: lld -flavor gnu -target x86_64 -T %p/phdrs/sections-none-phdrs.script %t.o -static -o %t4
+RUN: lld -flavor old-gnu -target x86_64 -T %p/phdrs/sections-none-phdrs.script %t.o -static -o %t4
RUN: llvm-objdump -section-headers %t4 | FileCheck -check-prefix SECTIONS %s
RUN: llvm-readobj -program-headers %t4 | FileCheck -check-prefix HEADERS %s
*/
diff --git a/lld/test/elf/linkerscript/phdrs-different.test b/lld/test/elf/linkerscript/phdrs-different.test
index c9a04e2a935..7fe14dd543d 100644
--- a/lld/test/elf/linkerscript/phdrs-different.test
+++ b/lld/test/elf/linkerscript/phdrs-different.test
@@ -3,7 +3,7 @@ Test sections put to different segments.
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
-RUN: lld -flavor gnu -target x86_64 -T %s %t.o -static -o %t1
+RUN: lld -flavor old-gnu -target x86_64 -T %s %t.o -static -o %t1
RUN: llvm-objdump -section-headers %t1 | FileCheck -check-prefix DIFF-PHDRS-SECS %s
RUN: llvm-readobj -program-headers %t1 | FileCheck -check-prefix DIFF-PHDRS-HDRS %s
*/
diff --git a/lld/test/elf/linkerscript/phdrs-extra-program.test b/lld/test/elf/linkerscript/phdrs-extra-program.test
index d69904c248e..3bf27dcb1f5 100644
--- a/lld/test/elf/linkerscript/phdrs-extra-program.test
+++ b/lld/test/elf/linkerscript/phdrs-extra-program.test
@@ -3,7 +3,7 @@ Test extra program header generates error.
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
-RUN: not lld -flavor gnu -target x86_64 -T %s %t.o -static -o %t1 &> %t1-error
+RUN: not lld -flavor old-gnu -target x86_64 -T %s %t.o -static -o %t1 &> %t1-error
RUN: FileCheck -check-prefix EXTRA-PROGRAM-PHDR %s < %t1-error
*/
diff --git a/lld/test/elf/linkerscript/phdrs-flags.test b/lld/test/elf/linkerscript/phdrs-flags.test
index d6011bd989c..0fac53e7530 100644
--- a/lld/test/elf/linkerscript/phdrs-flags.test
+++ b/lld/test/elf/linkerscript/phdrs-flags.test
@@ -3,7 +3,7 @@ Test sections put to different segments with FLAGS attribute set.
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
-RUN: lld -flavor gnu -target x86_64 -T %s %t.o -static -o %t1
+RUN: lld -flavor old-gnu -target x86_64 -T %s %t.o -static -o %t1
RUN: llvm-objdump -section-headers %t1 | FileCheck -check-prefix FLAGS-PHDRS-SECS %s
RUN: llvm-readobj -program-headers %t1 | FileCheck -check-prefix FLAGS-PHDRS-HDRS %s
*/
diff --git a/lld/test/elf/linkerscript/phdrs-has-program.test b/lld/test/elf/linkerscript/phdrs-has-program.test
index d4e5b51fdfe..83fe94c7061 100644
--- a/lld/test/elf/linkerscript/phdrs-has-program.test
+++ b/lld/test/elf/linkerscript/phdrs-has-program.test
@@ -3,7 +3,7 @@ Test when program segment is set it's generated.
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
-RUN: lld -flavor gnu -target x86_64 -T %s %t.o -static -o %t1
+RUN: lld -flavor old-gnu -target x86_64 -T %s %t.o -static -o %t1
RUN: llvm-readobj -program-headers %t1 | FileCheck -check-prefix PROGRAM-PHDR %s
*/
diff --git a/lld/test/elf/linkerscript/phdrs-invalid.test b/lld/test/elf/linkerscript/phdrs-invalid.test
index 9032e8543ef..c1426e8ffa5 100644
--- a/lld/test/elf/linkerscript/phdrs-invalid.test
+++ b/lld/test/elf/linkerscript/phdrs-invalid.test
@@ -38,7 +38,7 @@ RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
/*
Test undefined header used when no PHDRS defined.
-RUN: not lld -flavor gnu -target x86_64 -T %p/phdrs/undef-no-phdrs.script %t.o -static -o %t1 &> %t1-error
+RUN: not lld -flavor old-gnu -target x86_64 -T %p/phdrs/undef-no-phdrs.script %t.o -static -o %t1 &> %t1-error
RUN: FileCheck -check-prefix UNDEF-NO-PHDRS %s < %t1-error
UNDEF-NO-PHDRS: Unknown header identifiers (missing in PHDRS command) are used
@@ -47,7 +47,7 @@ UNDEF-NO-PHDRS: Unknown header identifiers (missing in PHDRS command) are used
/*
Test undefined header used when PHDRS is empty.
-RUN: not lld -flavor gnu -target x86_64 -T %p/phdrs/undef-empty-phdrs.script %t.o -static -o %t2 &> %t2-error
+RUN: not lld -flavor old-gnu -target x86_64 -T %p/phdrs/undef-empty-phdrs.script %t.o -static -o %t2 &> %t2-error
RUN: FileCheck -check-prefix UNDEF-EMPTY-PHDRS %s < %t2-error
UNDEF-EMPTY-PHDRS: Unknown header identifiers (missing in PHDRS command) are used
@@ -56,7 +56,7 @@ UNDEF-EMPTY-PHDRS: Unknown header identifiers (missing in PHDRS command) are use
/*
Test undefined header used when PHDRS contains definitions.
-RUN: not lld -flavor gnu -target x86_64 -T %p/phdrs/undef-id-phdrs.script %t.o -static -o %t3 &> %t3-error
+RUN: not lld -flavor old-gnu -target x86_64 -T %p/phdrs/undef-id-phdrs.script %t.o -static -o %t3 &> %t3-error
RUN: FileCheck -check-prefix UNDEF-ID-PHDRS %s < %t3-error
UNDEF-ID-PHDRS: Unknown header identifiers (missing in PHDRS command) are used
diff --git a/lld/test/elf/linkerscript/phdrs-misplaced-program.test b/lld/test/elf/linkerscript/phdrs-misplaced-program.test
index ff452015803..0fb669d818c 100644
--- a/lld/test/elf/linkerscript/phdrs-misplaced-program.test
+++ b/lld/test/elf/linkerscript/phdrs-misplaced-program.test
@@ -3,7 +3,7 @@ Test misplaced program header generates error.
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
-RUN: not lld -flavor gnu -target x86_64 -T %s %t.o -static -o %t1 &> %t1-error
+RUN: not lld -flavor old-gnu -target x86_64 -T %s %t.o -static -o %t1 &> %t1-error
RUN: FileCheck -check-prefix MISPLACED-PROGRAM-PHDR %s < %t1-error
*/
diff --git a/lld/test/elf/linkerscript/phdrs-no-program.test b/lld/test/elf/linkerscript/phdrs-no-program.test
index dfb20104e42..e461d506101 100644
--- a/lld/test/elf/linkerscript/phdrs-no-program.test
+++ b/lld/test/elf/linkerscript/phdrs-no-program.test
@@ -3,7 +3,7 @@ Test when no program segment set it's not generated.
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
-RUN: lld -flavor gnu -target x86_64 -T %s %t.o -static -o %t1
+RUN: lld -flavor old-gnu -target x86_64 -T %s %t.o -static -o %t1
RUN: llvm-readobj -program-headers %t1 | FileCheck -check-prefix PROGRAM-PHDR %s
*/
diff --git a/lld/test/elf/linkerscript/phdrs-one-none.test b/lld/test/elf/linkerscript/phdrs-one-none.test
index ebd9c8602a6..a1c84e59fc6 100644
--- a/lld/test/elf/linkerscript/phdrs-one-none.test
+++ b/lld/test/elf/linkerscript/phdrs-one-none.test
@@ -3,7 +3,7 @@ Test when one segment is marked as NONE.
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
-RUN: lld -flavor gnu -target x86_64 -T %s %t.o -static -o %t1
+RUN: lld -flavor old-gnu -target x86_64 -T %s %t.o -static -o %t1
RUN: llvm-objdump -section-headers %t1 | FileCheck -check-prefix NONE-PHDRS-SECS %s
RUN: llvm-readobj -program-headers %t1 | FileCheck -check-prefix NONE-PHDRS-HDRS %s
*/
diff --git a/lld/test/elf/linkerscript/phdrs-program-flags.test b/lld/test/elf/linkerscript/phdrs-program-flags.test
index 685af8e75a0..2a719a6cb29 100644
--- a/lld/test/elf/linkerscript/phdrs-program-flags.test
+++ b/lld/test/elf/linkerscript/phdrs-program-flags.test
@@ -3,7 +3,7 @@ Test when program segment contains only FLAGS attribute.
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
-RUN: lld -flavor gnu -target x86_64 -T %s %t.o -static -o %t1
+RUN: lld -flavor old-gnu -target x86_64 -T %s %t.o -static -o %t1
RUN: llvm-readobj -program-headers %t1 | FileCheck -check-prefix PROGRAM-FLAGS-PHDR %s
*/
diff --git a/lld/test/elf/linkerscript/phdrs-program-good-phdrs.test b/lld/test/elf/linkerscript/phdrs-program-good-phdrs.test
index 3ab585e5152..373facc380b 100644
--- a/lld/test/elf/linkerscript/phdrs-program-good-phdrs.test
+++ b/lld/test/elf/linkerscript/phdrs-program-good-phdrs.test
@@ -3,7 +3,7 @@ Test when program segment contains only PHDRS attribute.
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
-RUN: lld -flavor gnu -target x86_64 -T %s %t.o -static -o %t1
+RUN: lld -flavor old-gnu -target x86_64 -T %s %t.o -static -o %t1
RUN: llvm-readobj -program-headers %t1 | FileCheck -check-prefix PROGRAM-PHDRS-PHDR %s
*/
diff --git a/lld/test/elf/linkerscript/phdrs-program-no-phdrs.test b/lld/test/elf/linkerscript/phdrs-program-no-phdrs.test
index a6de7c2d938..3e639bdb0f4 100644
--- a/lld/test/elf/linkerscript/phdrs-program-no-phdrs.test
+++ b/lld/test/elf/linkerscript/phdrs-program-no-phdrs.test
@@ -3,7 +3,7 @@ Test when program segment doesn't contain PHDRS attribute.
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
-RUN: not lld -flavor gnu -target x86_64 -T %s %t.o -static -o %t1 &> %t1-error
+RUN: not lld -flavor old-gnu -target x86_64 -T %s %t.o -static -o %t1 &> %t1-error
RUN: FileCheck -check-prefix PROGRAM-PHDR-NO-PHDRS %s < %t1-error
*/
diff --git a/lld/test/elf/linkerscript/phdrs-program-wrong-phdrs.test b/lld/test/elf/linkerscript/phdrs-program-wrong-phdrs.test
index 48f17933680..c27b23d8587 100644
--- a/lld/test/elf/linkerscript/phdrs-program-wrong-phdrs.test
+++ b/lld/test/elf/linkerscript/phdrs-program-wrong-phdrs.test
@@ -3,7 +3,7 @@ Test when program segment contains PHDRS attribute not mapped to load segment.
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
-RUN: not lld -flavor gnu -target x86_64 -T %s %t.o -static -o %t1 &> %t1-error
+RUN: not lld -flavor old-gnu -target x86_64 -T %s %t.o -static -o %t1 &> %t1-error
RUN: FileCheck -check-prefix PROGRAM-PHDR-WRONG-PHDRS %s < %t1-error
*/
diff --git a/lld/test/elf/linkerscript/phdrs-same-flags.test b/lld/test/elf/linkerscript/phdrs-same-flags.test
index 64b6828242f..e39f6188103 100644
--- a/lld/test/elf/linkerscript/phdrs-same-flags.test
+++ b/lld/test/elf/linkerscript/phdrs-same-flags.test
@@ -3,7 +3,7 @@ Test sections put to same segment with FLAGS attribute set.
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
-RUN: lld -flavor gnu -target x86_64 -T %s %t.o -static -o %t1
+RUN: lld -flavor old-gnu -target x86_64 -T %s %t.o -static -o %t1
RUN: llvm-objdump -section-headers %t1 | FileCheck -check-prefix FLAGS-PHDRS-SECS %s
RUN: llvm-readobj -program-headers %t1 | FileCheck -check-prefix FLAGS-PHDRS-HDRS %s
*/
diff --git a/lld/test/elf/linkerscript/phdrs-same.test b/lld/test/elf/linkerscript/phdrs-same.test
index 11620e0d45b..92b3ad3909c 100644
--- a/lld/test/elf/linkerscript/phdrs-same.test
+++ b/lld/test/elf/linkerscript/phdrs-same.test
@@ -3,7 +3,7 @@ Test sections put to same segment.
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%t.o
-RUN: lld -flavor gnu -target x86_64 -T %s %t.o -static -o %t1
+RUN: lld -flavor old-gnu -target x86_64 -T %s %t.o -static -o %t1
RUN: llvm-objdump -section-headers %t1 | FileCheck -check-prefix SAME-PHDRS-SECS %s
RUN: llvm-readobj -program-headers %t1 | FileCheck -check-prefix SAME-PHDRS-HDRS %s
*/
diff --git a/lld/test/elf/linkerscript/sections-order.test b/lld/test/elf/linkerscript/sections-order.test
index 3ff56d5723b..4d23f5eb9d5 100644
--- a/lld/test/elf/linkerscript/sections-order.test
+++ b/lld/test/elf/linkerscript/sections-order.test
@@ -62,7 +62,7 @@ RUN: yaml2obj -format=elf %p/Inputs/prog2.o.yaml -o=%T/prog2.o
RUN: yaml2obj -format=elf %p/Inputs/prog3.o.yaml -o=%T/prog3.o
RUN: cd %T
-RUN: lld -flavor gnu -target x86_64 -T %s prog1.o prog2.o prog3.o \
+RUN: lld -flavor old-gnu -target x86_64 -T %s prog1.o prog2.o prog3.o \
RUN: -static -o %t1
RUN: llvm-readobj -s %t1 | FileCheck -check-prefix CHECKSECTIONS %s
diff --git a/lld/test/elf/linkerscript/sections-with-wildcards.test b/lld/test/elf/linkerscript/sections-with-wildcards.test
index 6af80d0883d..a390a2b2d36 100644
--- a/lld/test/elf/linkerscript/sections-with-wildcards.test
+++ b/lld/test/elf/linkerscript/sections-with-wildcards.test
@@ -63,7 +63,7 @@ RUN: yaml2obj -format=elf %p/Inputs/prog2.o.yaml -o=%T/p2.o
RUN: yaml2obj -format=elf %p/Inputs/prog3.o.yaml -o=%T/p3.o
RUN: cd %T
-RUN: lld -flavor gnu -target x86_64 -T %s p1.o p2.o p3.o \
+RUN: lld -flavor old-gnu -target x86_64 -T %s p1.o p2.o p3.o \
RUN: -static -o %t1
RUN: llvm-readobj -s %t1 | FileCheck -check-prefix CHECKSECTIONS %s
diff --git a/lld/test/elf/linkerscript/symbol-definition-so.test b/lld/test/elf/linkerscript/symbol-definition-so.test
index 7f4004761f8..15b22f6f581 100644
--- a/lld/test/elf/linkerscript/symbol-definition-so.test
+++ b/lld/test/elf/linkerscript/symbol-definition-so.test
@@ -16,7 +16,7 @@ SECTIONS
/*
RUN: yaml2obj -format=elf %p/Inputs/simple-pic.o.yaml -o=%t.o
-RUN: lld -flavor gnu -target x86_64 -shared -T %s %t.o -o %t.so
+RUN: lld -flavor old-gnu -target x86_64 -shared -T %s %t.o -o %t.so
RUN: llvm-readobj -s -symbols %t.so | FileCheck -check-prefix CHECKSYMS %s
CHECKSYMS: Name: .data
diff --git a/lld/test/elf/linkerscript/symbol-definition.test b/lld/test/elf/linkerscript/symbol-definition.test
index fc595bbe1f1..daa3b17e996 100644
--- a/lld/test/elf/linkerscript/symbol-definition.test
+++ b/lld/test/elf/linkerscript/symbol-definition.test
@@ -46,7 +46,7 @@ SECTIONS
RUN: mkdir -p %T
RUN: yaml2obj -format=elf %p/Inputs/simple.o.yaml -o=%T/simple.o
-RUN: lld -flavor gnu -target x86_64 -T %s %T/simple.o -static -o %t1
+RUN: lld -flavor old-gnu -target x86_64 -T %s %T/simple.o -static -o %t1
RUN: llvm-readobj -symbols %t1 | FileCheck -check-prefix CHECKSYMS %s
CHECKSYMS: Name: MYSTRING
diff --git a/lld/test/elf/linkerscript/valid-script-cli.objtxt b/lld/test/elf/linkerscript/valid-script-cli.objtxt
index 1ebe68ec4e6..a7342c41f52 100644
--- a/lld/test/elf/linkerscript/valid-script-cli.objtxt
+++ b/lld/test/elf/linkerscript/valid-script-cli.objtxt
@@ -1,15 +1,15 @@
# Check that the linker script inputs are accepted properly.
-# RUN: lld -flavor gnu -target x86_64 %p/Inputs/valid.ls -r %s \
+# RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/valid.ls -r %s \
# RUN: --output-filetype=yaml | FileCheck %s
-# RUN: lld -flavor gnu -target x86_64 -T %p/Inputs/valid.ls -r %s \
+# RUN: lld -flavor old-gnu -target x86_64 -T %p/Inputs/valid.ls -r %s \
# RUN: --output-filetype=yaml | FileCheck %s
-# RUN: lld -flavor gnu -target x86_64 --script=%p/Inputs/valid.ls -r %s \
+# RUN: lld -flavor old-gnu -target x86_64 --script=%p/Inputs/valid.ls -r %s \
# RUN: --output-filetype=yaml | FileCheck %s
-# RUN: lld -flavor gnu -target x86_64 -L%p/Inputs/ -l:valid.ls -r %s \
+# RUN: lld -flavor old-gnu -target x86_64 -L%p/Inputs/ -l:valid.ls -r %s \
# RUN: --output-filetype=yaml | FileCheck %s
defined-atoms:
diff --git a/lld/test/elf/loginputfiles.test b/lld/test/elf/loginputfiles.test
index 850570d8085..f1b78558e9c 100644
--- a/lld/test/elf/loginputfiles.test
+++ b/lld/test/elf/loginputfiles.test
@@ -20,7 +20,7 @@
# }
# gcc -c main.c fn.c fn1.c
-RUN: lld -flavor gnu -target x86_64-linux \
+RUN: lld -flavor old-gnu -target x86_64-linux \
RUN: %p/Inputs/mainobj.x86_64 %p/Inputs/libfnarchive.a -t --noinhibit-exec 2>&1 | \
RUN: FileCheck -check-prefix INPUTFILES %s
diff --git a/lld/test/elf/mergeatoms.test b/lld/test/elf/mergeatoms.test
index 521eb5a12c3..ec83ac2b884 100644
--- a/lld/test/elf/mergeatoms.test
+++ b/lld/test/elf/mergeatoms.test
@@ -1,5 +1,5 @@
# Tests that atoms are merged by testing it with --merge-strings option
-RUN: lld -flavor gnu -target x86_64-linux --merge-strings -o %t1 \
+RUN: lld -flavor old-gnu -target x86_64-linux --merge-strings -o %t1 \
RUN: %p/Inputs/foo.o.x86-64 %p/Inputs/bar.o.x86-64 -e bar1
RUN: llvm-objdump -s %t1 | FileCheck -check-prefix=mergeAtoms %s
diff --git a/lld/test/elf/mergeconstants.test b/lld/test/elf/mergeconstants.test
index 09a4ca2f6ca..719ae8a8b24 100644
--- a/lld/test/elf/mergeconstants.test
+++ b/lld/test/elf/mergeconstants.test
@@ -1,5 +1,5 @@
# The test checks for mergeable strings that appear in the object file
-RUN: lld -flavor gnu --merge-strings --output-filetype=yaml -target x86_64 \
+RUN: lld -flavor old-gnu --merge-strings --output-filetype=yaml -target x86_64 \
RUN: %p/Inputs/constants-merge.x86-64 --noinhibit-exec \
RUN: | FileCheck -check-prefix=mergeAtoms %s
diff --git a/lld/test/elf/mergeglobalatoms.test b/lld/test/elf/mergeglobalatoms.test
index e71dca53991..bf8dbf7593f 100644
--- a/lld/test/elf/mergeglobalatoms.test
+++ b/lld/test/elf/mergeglobalatoms.test
@@ -1,6 +1,6 @@
# ELF files can have mergeable strings which are global!, treat them as global
# defined atoms
-RUN: lld -flavor gnu --output-filetype=yaml %p/Inputs/globalconst.o.x86-64 \
+RUN: lld -flavor old-gnu --output-filetype=yaml %p/Inputs/globalconst.o.x86-64 \
RUN: --noinhibit-exec -target x86_64 | FileCheck -check-prefix=globalatoms %s
globalatoms: - name: mystr
diff --git a/lld/test/elf/no-unique-section-names.test b/lld/test/elf/no-unique-section-names.test
index 042f6d496be..4c5f79588db 100644
--- a/lld/test/elf/no-unique-section-names.test
+++ b/lld/test/elf/no-unique-section-names.test
@@ -1,6 +1,6 @@
# Check handling object files with non-unique named sections.
-RUN: lld -flavor gnu -target x86_64-linux -shared -o %t \
+RUN: lld -flavor old-gnu -target x86_64-linux -shared -o %t \
RUN: %p/Inputs/no-unique-section-names.x86-64
RUN: llvm-objdump -s %p/Inputs/no-unique-section-names.x86-64 %t \
RUN: | FileCheck %s
diff --git a/lld/test/elf/note.test b/lld/test/elf/note.test
index e7544c1f126..aff01c3e5b2 100644
--- a/lld/test/elf/note.test
+++ b/lld/test/elf/note.test
@@ -1,6 +1,6 @@
# Check that the linker is not ignoring input sections.
# RUN: yaml2obj -format=elf %s > %t.obj
-# RUN: lld -flavor gnu -target x86_64 %t.obj -o %t.exe --noinhibit-exec
+# RUN: lld -flavor old-gnu -target x86_64 %t.obj -o %t.exe --noinhibit-exec
# RUN: llvm-readobj -s %t.exe | FileCheck %s
# CHECK: Section {
diff --git a/lld/test/elf/options/dynamic-linker.test b/lld/test/elf/options/dynamic-linker.test
index 3d8feeb6e30..6b56f17c677 100644
--- a/lld/test/elf/options/dynamic-linker.test
+++ b/lld/test/elf/options/dynamic-linker.test
@@ -1,12 +1,12 @@
# This tests the functionality of specifying dynamic-linker argument in the
# command line
-RUN: lld -flavor gnu -target x86_64 --dynamic-linker="/xyz.so" \
+RUN: lld -flavor old-gnu -target x86_64 --dynamic-linker="/xyz.so" \
RUN: %p/../Inputs/foo.o.x86-64 --noinhibit-exec -o %t
RUN: llvm-objdump -s %t | FileCheck -check-prefix=DYNAMICINTERP1 %s
-RUN: lld -flavor gnu -target x86_64 --dynamic-linker="" \
+RUN: lld -flavor old-gnu -target x86_64 --dynamic-linker="" \
RUN: %p/../Inputs/foo.o.x86-64 --noinhibit-exec -o %t1
RUN: llvm-objdump -s %t1 | FileCheck -check-prefix=DYNAMICINTERP2 %s
-RUN: lld -flavor gnu -target x86_64 -dynamic-linker /xyz.so \
+RUN: lld -flavor old-gnu -target x86_64 -dynamic-linker /xyz.so \
RUN: %p/../Inputs/foo.o.x86-64 --noinhibit-exec -o %t2
RUN: llvm-objdump -s %t2 | FileCheck -check-prefix=DYNAMICINTERP1 %s
diff --git a/lld/test/elf/options/target-specific-args.test b/lld/test/elf/options/target-specific-args.test
index cdcd9b8a5de..ec5edf0ad62 100644
--- a/lld/test/elf/options/target-specific-args.test
+++ b/lld/test/elf/options/target-specific-args.test
@@ -1,5 +1,5 @@
# Test of target specific options
-# RUN: lld -flavor gnu -target x86_64 --target1-rel \
+# RUN: lld -flavor old-gnu -target x86_64 --target1-rel \
# RUN: %p/../Inputs/foo.o.x86-64 --noinhibit-exec -o %t 2>&1 | FileCheck %s
# CHECK: warning: ignoring unsupported ARM/ELF specific argument: --target1-rel
diff --git a/lld/test/elf/phdr.test b/lld/test/elf/phdr.test
index c8ab73d3146..c8b3664d025 100644
--- a/lld/test/elf/phdr.test
+++ b/lld/test/elf/phdr.test
@@ -1,7 +1,7 @@
# This test checks emission for program header for ELF binaries
-RUN: lld -flavor gnu -target i386-linux -o %t1 -e main %p/Inputs/phdr.i386 \
+RUN: lld -flavor old-gnu -target i386-linux -o %t1 -e main %p/Inputs/phdr.i386 \
RUN: && llvm-readobj -program-headers %t1 | FileCheck -check-prefix=I386 %s
-RUN: lld -flavor gnu -target x86_64-linux -o %t1 -e _start %p/Inputs/relocs.x86-64 -static \
+RUN: lld -flavor old-gnu -target x86_64-linux -o %t1 -e _start %p/Inputs/relocs.x86-64 -static \
RUN: && llvm-objdump -p %t1 | FileCheck %s -check-prefix=X86_64
diff --git a/lld/test/elf/quickdata.test b/lld/test/elf/quickdata.test
index a0777151722..85ad23d0b8e 100644
--- a/lld/test/elf/quickdata.test
+++ b/lld/test/elf/quickdata.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target hexagon --output-filetype=yaml %p/Inputs/quickdata-test.elf-hexagon \
+RUN: lld -flavor old-gnu -target hexagon --output-filetype=yaml %p/Inputs/quickdata-test.elf-hexagon \
RUN: --noinhibit-exec | FileCheck %s -check-prefix hexagon
hexagon: - name: ac1
diff --git a/lld/test/elf/reloc.test b/lld/test/elf/reloc.test
index 55b244432f8..f8cb056e03d 100644
--- a/lld/test/elf/reloc.test
+++ b/lld/test/elf/reloc.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target i386 --merge-strings -r --output-filetype=yaml \
+RUN: lld -flavor old-gnu -target i386 --merge-strings -r --output-filetype=yaml \
RUN: %p/Inputs/reloc-test.elf-i386 | FileCheck %s -check-prefix ELF-i386
ELF-i386: defined-atoms:
diff --git a/lld/test/elf/responsefile.test b/lld/test/elf/responsefile.test
index 5957471bb66..89e9ffd015b 100644
--- a/lld/test/elf/responsefile.test
+++ b/lld/test/elf/responsefile.test
@@ -1,4 +1,4 @@
-# RUN: not lld -flavor gnu --abc @%p/Inputs/responsefile --baz >& %t.log
+# RUN: not lld -flavor old-gnu --abc @%p/Inputs/responsefile --baz >& %t.log
# RUN: FileCheck %s < %t.log
CHECK: warning: ignoring unknown argument: --abc
diff --git a/lld/test/elf/rodata.test b/lld/test/elf/rodata.test
index dfe6985c073..12d9abb2a19 100644
--- a/lld/test/elf/rodata.test
+++ b/lld/test/elf/rodata.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target x86_64-linux -o %t %p/Inputs/constdata.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux -o %t %p/Inputs/constdata.x86-64 \
RUN: -static -e _start
RUN: llvm-objdump -s %t | FileCheck %s
diff --git a/lld/test/elf/rosegment.test b/lld/test/elf/rosegment.test
index 32638d8fce6..675dc386186 100644
--- a/lld/test/elf/rosegment.test
+++ b/lld/test/elf/rosegment.test
@@ -1,8 +1,8 @@
# Tests that the option --rosegment produces an output file with a separate
# segment created for read only data.
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/rodata.o -o %t1.elf \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/rodata.o -o %t1.elf \
RUN: --noinhibit-exec
-RUN: lld -flavor gnu -target x86_64 %p/Inputs/rodata.o --rosegment -o %t2.elf \
+RUN: lld -flavor old-gnu -target x86_64 %p/Inputs/rodata.o --rosegment -o %t2.elf \
RUN: --noinhibit-exec
RUN: llvm-readobj -program-headers %t1.elf | FileCheck %s -check-prefix=NORO-SEGMENT
RUN: llvm-readobj -program-headers %t2.elf | FileCheck %s -check-prefix=RO-SEGMENT
diff --git a/lld/test/elf/sectionGroups/sectiongroup-new-members.test b/lld/test/elf/sectionGroups/sectiongroup-new-members.test
index eeace002d4d..dff1a96b07e 100644
--- a/lld/test/elf/sectionGroups/sectiongroup-new-members.test
+++ b/lld/test/elf/sectionGroups/sectiongroup-new-members.test
@@ -17,9 +17,9 @@
#bar:
#RUN: yaml2obj -format=elf -docnum 1 %s -o %t.group1a.o
#RUN: yaml2obj -format=elf -docnum 2 %s -o %t.group1b.o
-#RUN: lld -flavor gnu -target x86_64 %t.group1a.o %t.group1b.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.group1a.o %t.group1b.o \
#RUN: --noinhibit-exec --output-filetype=yaml -o %t2.out.yaml
-#RUN: lld -flavor gnu -target x86_64 %t.group1a.o %t.group1b.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.group1a.o %t.group1b.o \
#RUN: --noinhibit-exec -o %t2.out
#RUN: FileCheck %s -check-prefix=CHECKGROUP < %t2.out.yaml
#RUN: llvm-readobj -sections %t2.out | FileCheck %s -check-prefix=CHECKGROUPSECTIONS
diff --git a/lld/test/elf/sectionGroups/sectiongroup-simple.test b/lld/test/elf/sectionGroups/sectiongroup-simple.test
index 3451afc2557..57707f84475 100644
--- a/lld/test/elf/sectionGroups/sectiongroup-simple.test
+++ b/lld/test/elf/sectionGroups/sectiongroup-simple.test
@@ -13,9 +13,9 @@
#bar:
#RUN: yaml2obj -format=elf -docnum 1 %s -o %t.group1a.o
#RUN: yaml2obj -format=elf -docnum 2 %s -o %t.group1b.o
-#RUN: lld -flavor gnu -target x86_64 %t.group1a.o %t.group1b.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.group1a.o %t.group1b.o \
#RUN: --noinhibit-exec --output-filetype=yaml -o %t2.out.yaml
-#RUN: lld -flavor gnu -target x86_64 %t.group1a.o %t.group1b.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.group1a.o %t.group1b.o \
#RUN: --noinhibit-exec -o %t2.out
#RUN: FileCheck %s -check-prefix=CHECKGROUP < %t2.out.yaml
#RUN: llvm-readobj -sections %t2.out | FileCheck %s -check-prefix=CHECKGROUPSECTIONS
diff --git a/lld/test/elf/sectionGroups/sectiongroup-undef-member-other.test b/lld/test/elf/sectionGroups/sectiongroup-undef-member-other.test
index 1d60ce6c866..56595e59d8d 100644
--- a/lld/test/elf/sectionGroups/sectiongroup-undef-member-other.test
+++ b/lld/test/elf/sectionGroups/sectiongroup-undef-member-other.test
@@ -16,7 +16,7 @@
#
#RUN: yaml2obj -format=elf -docnum 1 %s -o %t.group1a.o
#RUN: yaml2obj -format=elf -docnum 2 %s -o %t.group1b.o
-#RUN: lld -flavor gnu -target x86_64 %t.group1a.o %t.group1b.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.group1a.o %t.group1b.o \
#RUN: --noinhibit-exec -o %t2.out 2>&1 | FileCheck %s
#CHECK: Undefined symbol: {{.*}} g1
---
diff --git a/lld/test/elf/sectionGroups/sectiongroup-undef-member.test b/lld/test/elf/sectionGroups/sectiongroup-undef-member.test
index 6fbc71ca54e..65e9ec7632b 100644
--- a/lld/test/elf/sectionGroups/sectiongroup-undef-member.test
+++ b/lld/test/elf/sectionGroups/sectiongroup-undef-member.test
@@ -15,7 +15,7 @@
#
#RUN: yaml2obj -format=elf -docnum 1 %s -o %t.group1a.o
#RUN: yaml2obj -format=elf -docnum 2 %s -o %t.group1b.o
-#RUN: lld -flavor gnu -target x86_64 %t.group1a.o %t.group1b.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.group1a.o %t.group1b.o \
#RUN: --noinhibit-exec -o %t2.out 2>&1 | FileCheck %s
#CHECK: Undefined symbol: {{.*}} g1
---
diff --git a/lld/test/elf/sectionGroups/sectiongroup-with-globalsymbols.test b/lld/test/elf/sectionGroups/sectiongroup-with-globalsymbols.test
index ee0d7eb7785..9f8f80c2360 100644
--- a/lld/test/elf/sectionGroups/sectiongroup-with-globalsymbols.test
+++ b/lld/test/elf/sectionGroups/sectiongroup-with-globalsymbols.test
@@ -28,9 +28,9 @@
#RUN: yaml2obj -format=elf -docnum 1 %s -o %t.comdat1.o
#RUN: yaml2obj -format=elf -docnum 2 %s -o %t.comdat2.o
#RUN: yaml2obj -format=elf -docnum 3 %s -o %t.g1.o
-#RUN: lld -flavor gnu -target x86_64 %t.comdat1.o %t.comdat2.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.comdat1.o %t.comdat2.o \
#RUN: %t.g1.o --noinhibit-exec --output-filetype=yaml -o %t2.out.yaml
-#RUN: lld -flavor gnu -target x86_64 %t.comdat1.o %t.comdat2.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.comdat1.o %t.comdat2.o \
#RUN: %t.g1.o --noinhibit-exec -o %t2.out
#RUN: FileCheck %s -check-prefix=CHECKGROUP < %t2.out.yaml
#RUN: llvm-readobj -sections %t2.out | FileCheck %s -check-prefix=CHECKGROUPSECTIONS
diff --git a/lld/test/elf/sectionGroups/sectiongroup-with-undef-external-reference.test b/lld/test/elf/sectionGroups/sectiongroup-with-undef-external-reference.test
index 09efc2629f1..0c5d65ad544 100644
--- a/lld/test/elf/sectionGroups/sectiongroup-with-undef-external-reference.test
+++ b/lld/test/elf/sectionGroups/sectiongroup-with-undef-external-reference.test
@@ -21,9 +21,9 @@
#RUN: yaml2obj -format=elf -docnum 1 %s -o %t.comdat1.o
#RUN: yaml2obj -format=elf -docnum 2 %s -o %t.comdat2.o
#RUN: yaml2obj -format=elf -docnum 3 %s -o %t.g1.o
-#RUN: lld -flavor gnu -target x86_64 %t.comdat1.o %t.comdat2.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.comdat1.o %t.comdat2.o \
#RUN: %t.g1.o --noinhibit-exec --output-filetype=yaml -o %t2.out.yaml
-#RUN: lld -flavor gnu -target x86_64 %t.comdat1.o %t.comdat2.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.comdat1.o %t.comdat2.o \
#RUN: %t.g1.o --noinhibit-exec -o %t2.out
#RUN: FileCheck %s -check-prefix=CHECKGROUP < %t2.out.yaml
#RUN: llvm-readobj -sections %t2.out | FileCheck %s -check-prefix=CHECKGROUPSECTIONS
diff --git a/lld/test/elf/sectionGroups/sectiongroup-with-undef-signature.test b/lld/test/elf/sectionGroups/sectiongroup-with-undef-signature.test
index 06f1954d067..83a69a3828b 100644
--- a/lld/test/elf/sectionGroups/sectiongroup-with-undef-signature.test
+++ b/lld/test/elf/sectionGroups/sectiongroup-with-undef-signature.test
@@ -18,9 +18,9 @@
#RUN: yaml2obj -format=elf -docnum 1 %s -o %t.comdat1.o
#RUN: yaml2obj -format=elf -docnum 2 %s -o %t.comdat2.o
#RUN: yaml2obj -format=elf -docnum 3 %s -o %t.g1.o
-#RUN: lld -flavor gnu -target x86_64 %t.comdat1.o %t.comdat2.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.comdat1.o %t.comdat2.o \
#RUN: %t.g1.o --noinhibit-exec --output-filetype=yaml -o %t2.out.yaml
-#RUN: lld -flavor gnu -target x86_64 %t.comdat1.o %t.comdat2.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.comdat1.o %t.comdat2.o \
#RUN: %t.g1.o --noinhibit-exec -o %t2.out
#RUN: FileCheck %s -check-prefix=CHECKGROUP < %t2.out.yaml
#RUN: llvm-readobj -sections %t2.out | FileCheck %s -check-prefix=CHECKGROUPSECTIONS
diff --git a/lld/test/elf/sections.test b/lld/test/elf/sections.test
index 8839aa6d4e8..f36cad61918 100644
--- a/lld/test/elf/sections.test
+++ b/lld/test/elf/sections.test
@@ -1,6 +1,6 @@
# This test checks if sections are created properly in the output that appear in
# the input
-RUN: lld -flavor gnu -target i386 -o %t1 %p/Inputs/section-test.i386 \
+RUN: lld -flavor old-gnu -target i386 -o %t1 %p/Inputs/section-test.i386 \
RUN: -static -e baz
RUN: llvm-objdump -section-headers %t1 | FileCheck -check-prefix=OBJDUMP %s
RUN: llvm-readobj -h -s -t %t1 | FileCheck -check-prefix=READOBJ %s
diff --git a/lld/test/elf/sh_addralign.test b/lld/test/elf/sh_addralign.test
index dc24da65732..97ddd5f1030 100644
--- a/lld/test/elf/sh_addralign.test
+++ b/lld/test/elf/sh_addralign.test
@@ -1,6 +1,6 @@
# Check handling of section alignment.
# RUN: yaml2obj -format=elf %s > %t-obj
-# RUN: lld -flavor gnu -target arm64 -o %t-exe %t-obj
+# RUN: lld -flavor old-gnu -target arm64 -o %t-exe %t-obj
# RUN: llvm-objdump -h %t-exe | FileCheck %s
# CHECK: 8 .data 00000000 0000000000402000 DATA
diff --git a/lld/test/elf/shndx.test b/lld/test/elf/shndx.test
index ddd8b1b23b6..c86fa3349b5 100644
--- a/lld/test/elf/shndx.test
+++ b/lld/test/elf/shndx.test
@@ -2,7 +2,7 @@ Test that we can handle shndx. The test file has a shndx despite having only
a few sections. One might consider it invalid, but it has a clear interpretation
and avoids needing 65K sections to test the corresponding code path.
-RUN: lld -target x86_64-pc-linux -flavor gnu %p/Inputs/shndx.o-x86_64 -o %t.so -shared
+RUN: lld -target x86_64-pc-linux -flavor old-gnu %p/Inputs/shndx.o-x86_64 -o %t.so -shared
RUN: llvm-readobj -s -t %t.so | FileCheck %s
CHECK: Name: .text
diff --git a/lld/test/elf/soname.test b/lld/test/elf/soname.test
index 79c089ec607..b4dce9746d4 100644
--- a/lld/test/elf/soname.test
+++ b/lld/test/elf/soname.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -shared -target i386 -e main %p/Inputs/writersyms.o \
+RUN: lld -flavor old-gnu -shared -target i386 -e main %p/Inputs/writersyms.o \
RUN: -o %t -soname libtest.so
RUN: llvm-readobj -dynamic-table %t | FileCheck %s
diff --git a/lld/test/elf/start-stop-sym.test b/lld/test/elf/start-stop-sym.test
index 3702eb73803..62c16a91ee6 100644
--- a/lld/test/elf/start-stop-sym.test
+++ b/lld/test/elf/start-stop-sym.test
@@ -3,7 +3,7 @@
# RUN: yaml2obj -format=elf -docnum 1 %s > %t1.o
# RUN: yaml2obj -format=elf -docnum 2 %s > %t2.o
-# RUN: lld -flavor gnu -target mipsel -static -e T0 -o %t.exe %t1.o %t2.o
+# RUN: lld -flavor old-gnu -target mipsel -static -e T0 -o %t.exe %t1.o %t2.o
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: Contents of section .text:
diff --git a/lld/test/elf/strip-all.test b/lld/test/elf/strip-all.test
index bf8974dbfad..faf30349ec8 100644
--- a/lld/test/elf/strip-all.test
+++ b/lld/test/elf/strip-all.test
@@ -19,7 +19,7 @@
# }
#RUN: yaml2obj -format=elf %s -o=%t.o
-#RUN: lld -flavor gnu -target x86_64 %t.o -e=main --strip-all -o %t1
+#RUN: lld -flavor old-gnu -target x86_64 %t.o -e=main --strip-all -o %t1
#RUN: llvm-objdump -section-headers %t1 | FileCheck %s
#CHECK: 14 .shstrtab 0000007d 0000000000000000
diff --git a/lld/test/elf/stripped-empty.test b/lld/test/elf/stripped-empty.test
index 0403808db2e..ddf3b3899d1 100644
--- a/lld/test/elf/stripped-empty.test
+++ b/lld/test/elf/stripped-empty.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -shared -o test.so \
+RUN: lld -flavor old-gnu -shared -o test.so \
RUN: -target x86_64 %p/Inputs/stripped-empty.x86_64
test that we handle files without a symbol table.
diff --git a/lld/test/elf/symbols.test b/lld/test/elf/symbols.test
index 7f6bbdbc8c1..bcf399e86eb 100644
--- a/lld/test/elf/symbols.test
+++ b/lld/test/elf/symbols.test
@@ -14,9 +14,9 @@
#}
#
-RUN: lld -flavor gnu -target i386 -e main %p/Inputs/writersyms.o -o %t1
+RUN: lld -flavor old-gnu -target i386 -e main %p/Inputs/writersyms.o -o %t1
RUN: llvm-nm -n %t1 | FileCheck -check-prefix CHECKSYMS %s
-RUN: lld -flavor gnu -shared -target i386 -e main %p/Inputs/writersyms.o -o %t1
+RUN: lld -flavor old-gnu -shared -target i386 -e main %p/Inputs/writersyms.o -o %t1
RUN: llvm-nm -n %t1 | FileCheck -check-prefix CHECKSHAREDSYMS %s
CHECKSYMS: {{[0-9a-f]+}} a 1.c
diff --git a/lld/test/elf/tls-tbss-size.test b/lld/test/elf/tls-tbss-size.test
index 748b78c4eac..a7fd86cb7b4 100644
--- a/lld/test/elf/tls-tbss-size.test
+++ b/lld/test/elf/tls-tbss-size.test
@@ -22,7 +22,7 @@
#RUN: yaml2obj -format=elf -o=%t-t1.o %p/Inputs/tls-tbss-size.yaml
#RUN: yaml2obj -format=elf -o=%t-t0.o %s
-#RUN: lld -flavor gnu -target x86_64-linux --noinhibit-exec -o %t.exe %t-t0.o %t-t1.o
+#RUN: lld -flavor old-gnu -target x86_64-linux --noinhibit-exec -o %t.exe %t-t0.o %t-t1.o
#RUN: llvm-readobj --sections %t.exe | FileCheck %s
#CHECK: Sections [
diff --git a/lld/test/elf/tls.test b/lld/test/elf/tls.test
index ff37cadd3d8..6fb33941a88 100644
--- a/lld/test/elf/tls.test
+++ b/lld/test/elf/tls.test
@@ -1,10 +1,10 @@
# REQUIRES: x86
# This tests verifies that TLS variables have correct offsets
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/tls.x86-64 -static \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/tls.x86-64 -static \
RUN: --output-filetype=yaml --noinhibit-exec | FileCheck %s -check-prefix=YAML
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/tls.x86-64 -o %t \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/tls.x86-64 -o %t \
RUN: --noinhibit-exec -e main -static && llvm-objdump -d %t | FileCheck %s
// Verify that the TLS accesses have the correct offsets.
diff --git a/lld/test/elf/tlsAddr.test b/lld/test/elf/tlsAddr.test
index 6bc5e3e9bf7..bcb089c504e 100644
--- a/lld/test/elf/tlsAddr.test
+++ b/lld/test/elf/tlsAddr.test
@@ -1,6 +1,6 @@
# This tests verifies that TLS variables have correct offsets
# and that TBSS doesn't occupy memory
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/tlsAddr.x86-64 -static \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/tlsAddr.x86-64 -static \
RUN: -o %t --noinhibit-exec
RUN: llvm-objdump -section-headers %t | FileCheck -check-prefix=CHECKADDR %s
diff --git a/lld/test/elf/undef-from-dso-to-main.test b/lld/test/elf/undef-from-dso-to-main.test
index 9dc6c62b498..c19a0197061 100644
--- a/lld/test/elf/undef-from-dso-to-main.test
+++ b/lld/test/elf/undef-from-dso-to-main.test
@@ -2,9 +2,9 @@
# forces the final executable to export the symbol.
#RUN: yaml2obj -format=elf %p/Inputs/undef2-so.o.yaml -o=%t.o.so
-#RUN: lld -flavor gnu -target x86_64 -shared %t.o.so -o %T/libundef2.so
+#RUN: lld -flavor old-gnu -target x86_64 -shared %t.o.so -o %T/libundef2.so
#RUN: yaml2obj -format=elf %s -o=%t.o
-#RUN: lld -flavor gnu -target x86_64 %t.o -L%T -lundef2 -o %t1
+#RUN: lld -flavor old-gnu -target x86_64 %t.o -L%T -lundef2 -o %t1
#RUN: llvm-readobj -dyn-symbols %t1 | FileCheck -check-prefix CHECKSYMS %s
---
diff --git a/lld/test/elf/undef-from-main-dso.test b/lld/test/elf/undef-from-main-dso.test
index 43faef0e74c..8722a55f672 100644
--- a/lld/test/elf/undef-from-main-dso.test
+++ b/lld/test/elf/undef-from-main-dso.test
@@ -1,8 +1,8 @@
-RUN: lld -flavor gnu -target x86_64 -e main -o %t -L%p/Inputs \
+RUN: lld -flavor old-gnu -target x86_64 -e main -o %t -L%p/Inputs \
RUN: %p/Inputs/undef.o -lundef
RUN: llvm-readobj -relocations -symbols -dyn-symbols %t | FileCheck %s
-RUN: lld -flavor gnu -target x86_64 -e main -o %t -L%p/Inputs \
+RUN: lld -flavor old-gnu -target x86_64 -e main -o %t -L%p/Inputs \
RUN: %p/Inputs/undef-pc32.o -lundef
RUN: llvm-readobj -relocations -symbols -dyn-symbols %t | FileCheck %s
diff --git a/lld/test/elf/weaksym.test b/lld/test/elf/weaksym.test
index 0e265028e5e..59d997edc64 100644
--- a/lld/test/elf/weaksym.test
+++ b/lld/test/elf/weaksym.test
@@ -1,7 +1,7 @@
# Tests that a weak reference remains a weak reference,
# even if a shared library defines the symbol weak as well.
-RUN: lld -flavor gnu -target x86_64 -shared %p/Inputs/weaksym.o -L%p/Inputs -lweaksym -o %t1
+RUN: lld -flavor old-gnu -target x86_64 -shared %p/Inputs/weaksym.o -L%p/Inputs -lweaksym -o %t1
RUN: llvm-nm -n %t1 | FileCheck -check-prefix CHECKSYMS %s
CHECKSYMS: w weaksym
diff --git a/lld/test/elf/wrap.test b/lld/test/elf/wrap.test
index e159bd21b1c..427764970be 100644
--- a/lld/test/elf/wrap.test
+++ b/lld/test/elf/wrap.test
@@ -25,9 +25,9 @@
#RUN: yaml2obj -format=elf -docnum 1 %s -o %t.main.o
#RUN: yaml2obj -format=elf -docnum 2 %s -o %t.wrapfoo.o
#RUN: yaml2obj -format=elf -docnum 3 %s -o %t.realfoo.o
-#RUN: lld -flavor gnu -target x86_64 %t.main.o %t.wrapfoo.o %t.realfoo.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.main.o %t.wrapfoo.o %t.realfoo.o \
#RUN: --wrap foo --wrap foo --noinhibit-exec --output-filetype=yaml -o %t2.out
-#RUN: lld -flavor gnu -target x86_64 %t.main.o %t.wrapfoo.o \
+#RUN: lld -flavor old-gnu -target x86_64 %t.main.o %t.wrapfoo.o \
#RUN: --wrap foo --wrap foo --noinhibit-exec --output-filetype=yaml -o %t2.out.undef 2>&1 | \
#RUN: FileCheck %s -check-prefix=CHECKUNDEF
#CHECKWRAP: - name: main
diff --git a/lld/test/elf/x86-64-dynamic-relocs.test b/lld/test/elf/x86-64-dynamic-relocs.test
index 468a6d78468..c5572d0aa3a 100644
--- a/lld/test/elf/x86-64-dynamic-relocs.test
+++ b/lld/test/elf/x86-64-dynamic-relocs.test
@@ -1,4 +1,4 @@
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/relocs-dynamic.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/relocs-dynamic.x86-64 \
RUN: --output-filetype=yaml --noinhibit-exec | FileCheck %s
path: <linker-internal>
diff --git a/lld/test/elf/x86-64-dynamic.test b/lld/test/elf/x86-64-dynamic.test
index 094f2df72ff..d957e6ee85e 100644
--- a/lld/test/elf/x86-64-dynamic.test
+++ b/lld/test/elf/x86-64-dynamic.test
@@ -1,10 +1,10 @@
# Checks that linking an object file with a shared object creates the necessary
# PLT/GOT Entries
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/use-shared.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/use-shared.x86-64 \
RUN: %p/Inputs/shared.so-x86-64 --output-filetype=yaml -o %t1 --noinhibit-exec
RUN: FileCheck %s < %t1
-RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/use-shared-32s.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux %p/Inputs/use-shared-32s.x86-64 \
RUN: %p/Inputs/shared.so-x86-64 --output-filetype=yaml --noinhibit-exec \
RUN: | FileCheck %s --check-prefix=32S
diff --git a/lld/test/elf/x86.test b/lld/test/elf/x86.test
index 6b68837193e..3bc4a6963a5 100644
--- a/lld/test/elf/x86.test
+++ b/lld/test/elf/x86.test
@@ -18,7 +18,7 @@
#
# Assembled with: "as --32"
-RUN: lld -flavor gnu -target i386 -e back --output-filetype=yaml %p/Inputs/reloc-xb.x86 %p/Inputs/reloc-xt.x86 | FileCheck %s -check-prefix x86-yaml
+RUN: lld -flavor old-gnu -target i386 -e back --output-filetype=yaml %p/Inputs/reloc-xb.x86 %p/Inputs/reloc-xt.x86 | FileCheck %s -check-prefix x86-yaml
x86-yaml: - name: back
x86-yaml: scope: global
diff --git a/lld/test/elf/x86_64-kinds.test b/lld/test/elf/x86_64-kinds.test
index 49586059d95..111cea53bf0 100644
--- a/lld/test/elf/x86_64-kinds.test
+++ b/lld/test/elf/x86_64-kinds.test
@@ -1,10 +1,10 @@
REQUIRES: x86
-RUN: lld -flavor gnu -target x86_64-linux -o %t1 %p/Inputs/relocs.x86-64 \
+RUN: lld -flavor old-gnu -target x86_64-linux -o %t1 %p/Inputs/relocs.x86-64 \
RUN: -e _start -static
RUN: llvm-objdump -d %t1 | FileCheck %s -check-prefix=RELOCS
-RUN: lld -flavor gnu -target x86_64-linux --output-filetype=yaml -e _start -static \
+RUN: lld -flavor old-gnu -target x86_64-linux --output-filetype=yaml -e _start -static \
RUN: %p/Inputs/relocs.x86-64 | FileCheck %s -check-prefix=X86_64
RELOCS: ELF64-x86-64
diff --git a/lld/test/elf/zoption_dtflags.test b/lld/test/elf/zoption_dtflags.test
index d366c9a4750..274981bb136 100644
--- a/lld/test/elf/zoption_dtflags.test
+++ b/lld/test/elf/zoption_dtflags.test
@@ -1,7 +1,7 @@
# Test that -z {origin, now} options work.
#
#RUN: yaml2obj -format=elf %s -o=%t.o
-#RUN: lld -flavor gnu -target x86_64 %t.o -e=main -z now -z origin -o %t1
+#RUN: lld -flavor old-gnu -target x86_64 %t.o -e=main -z now -z origin -o %t1
#RUN: llvm-readobj -dynamic-table %t1 | FileCheck %s
#
#CHECK: 0x000000000000001E FLAGS ORIGIN BIND_NOW
OpenPOWER on IntegriCloud