Skip to content

Commit d984067

Browse files
dcandlerdcandler
committed
Update target triples affected by normalization change
The way in which clang normalizes certain target triples was recently changed: llvm/llvm-project#89638 This has the effect of switching the vendor and OS from "none-unknown" to "unknown-none" in the normalized triple, to better reflect that the bare metal target has no OS, rather than an unknown one. The cmake script and multilib templates have various hardcoded references to triples which now need changing.
1 parent 163d5b2 commit d984067

File tree

2 files changed

+52
-52
lines changed

2 files changed

+52
-52
lines changed

‎CMakeLists.txt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ Use -march to specify the architecture.")
870870
message(FATAL_ERROR "\
871871
Hard-float library with target triple \"${target_triple}\" must end \"-eabihf\"")
872872
endif()
873-
string(REPLACE "-none-" "-none-unknown-" normalized_target_triple ${target_triple})
873+
string(REPLACE "-none-" "-unknown-none-" normalized_target_triple ${target_triple})
874874

875875
get_runtimes_flags("${directory}" "${flags}")
876876

@@ -1298,7 +1298,7 @@ set(multilib_yaml_content "")
12981298
add_library_variants_for_cpu(
12991299
aarch64
13001300
COMPILE_FLAGS "-march=armv8-a"
1301-
MULTILIB_FLAGS "--target=aarch64-none-unknown-elf"
1301+
MULTILIB_FLAGS "--target=aarch64-unknown-none-elf"
13021302
QEMU_MACHINE "virt"
13031303
QEMU_CPU "cortex-a57"
13041304
BOOT_FLASH_ADDRESS 0x40000000
@@ -1315,7 +1315,7 @@ add_library_variants_for_cpu(
13151315
add_library_variants_for_cpu(
13161316
armv4t
13171317
COMPILE_FLAGS "-march=armv4t -mfpu=none"
1318-
MULTILIB_FLAGS "--target=armv4t-none-unknown-eabi -mfpu=none"
1318+
MULTILIB_FLAGS "--target=armv4t-unknown-none-eabi -mfpu=none"
13191319
QEMU_MACHINE "none"
13201320
QEMU_CPU "ti925t"
13211321
QEMU_PARAMS "-m 1G"
@@ -1330,7 +1330,7 @@ add_library_variants_for_cpu(
13301330
add_library_variants_for_cpu(
13311331
armv5te
13321332
COMPILE_FLAGS "-march=armv5te -mfpu=none"
1333-
MULTILIB_FLAGS "--target=armv5e-none-unknown-eabi -mfpu=none"
1333+
MULTILIB_FLAGS "--target=armv5e-unknown-none-eabi -mfpu=none"
13341334
QEMU_MACHINE "none"
13351335
QEMU_CPU "arm926"
13361336
QEMU_PARAMS "-m 1G"
@@ -1346,7 +1346,7 @@ add_library_variants_for_cpu(
13461346
armv6m
13471347
SUFFIX soft_nofp
13481348
COMPILE_FLAGS "-mfloat-abi=soft -march=armv6m -mfpu=none"
1349-
MULTILIB_FLAGS "--target=thumbv6m-none-unknown-eabi -mfpu=none"
1349+
MULTILIB_FLAGS "--target=thumbv6m-unknown-none-eabi -mfpu=none"
13501350
QEMU_MACHINE "mps2-an385"
13511351
BOOT_FLASH_ADDRESS 0x00000000
13521352
BOOT_FLASH_SIZE 0x1000
@@ -1360,7 +1360,7 @@ add_library_variants_for_cpu(
13601360
armv7a
13611361
SUFFIX soft_nofp
13621362
COMPILE_FLAGS "-mfloat-abi=soft -march=armv7a -mfpu=none"
1363-
MULTILIB_FLAGS "--target=armv7-none-unknown-eabi -mfpu=none"
1363+
MULTILIB_FLAGS "--target=armv7-unknown-none-eabi -mfpu=none"
13641364
QEMU_MACHINE "none"
13651365
QEMU_CPU "cortex-a7"
13661366
QEMU_PARAMS "-m 1G"
@@ -1376,7 +1376,7 @@ add_library_variants_for_cpu(
13761376
armv7a
13771377
SUFFIX hard_vfpv3_d16
13781378
COMPILE_FLAGS "-mfloat-abi=hard -march=armv7a -mfpu=vfpv3-d16"
1379-
MULTILIB_FLAGS "--target=armv7-none-unknown-eabihf -mfpu=vfpv3-d16"
1379+
MULTILIB_FLAGS "--target=armv7-unknown-none-eabihf -mfpu=vfpv3-d16"
13801380
QEMU_MACHINE "none"
13811381
QEMU_CPU "cortex-a8"
13821382
QEMU_PARAMS "-m 1G"
@@ -1392,7 +1392,7 @@ add_library_variants_for_cpu(
13921392
armv7r
13931393
SUFFIX soft_nofp
13941394
COMPILE_FLAGS "-mfloat-abi=soft -march=armv7r -mfpu=none"
1395-
MULTILIB_FLAGS "--target=armv7r-none-unknown-eabi -mfpu=none"
1395+
MULTILIB_FLAGS "--target=armv7r-unknown-none-eabi -mfpu=none"
13961396
QEMU_MACHINE "none"
13971397
QEMU_CPU "cortex-r5f"
13981398
QEMU_PARAMS "-m 1G"
@@ -1408,7 +1408,7 @@ add_library_variants_for_cpu(
14081408
armv7r
14091409
SUFFIX hard_vfpv3_d16
14101410
COMPILE_FLAGS "-mfloat-abi=hard -march=armv7r -mfpu=vfpv3-d16"
1411-
MULTILIB_FLAGS "--target=armv7r-none-unknown-eabihf -mfpu=vfpv3-d16"
1411+
MULTILIB_FLAGS "--target=armv7r-unknown-none-eabihf -mfpu=vfpv3-d16"
14121412
QEMU_MACHINE "none"
14131413
QEMU_CPU "cortex-r5f"
14141414
QEMU_PARAMS "-m 1G"
@@ -1424,7 +1424,7 @@ add_library_variants_for_cpu(
14241424
armv7m
14251425
SUFFIX soft_fpv4_sp_d16
14261426
COMPILE_FLAGS "-mfloat-abi=softfp -march=armv7m -mfpu=fpv4-sp-d16"
1427-
MULTILIB_FLAGS "--target=thumbv7m-none-unknown-eabi -mfpu=fpv4-sp-d16"
1427+
MULTILIB_FLAGS "--target=thumbv7m-unknown-none-eabi -mfpu=fpv4-sp-d16"
14281428
QEMU_MACHINE "mps2-an386"
14291429
QEMU_CPU "cortex-m4"
14301430
BOOT_FLASH_ADDRESS 0x00000000
@@ -1439,7 +1439,7 @@ add_library_variants_for_cpu(
14391439
armv7m
14401440
SUFFIX soft_nofp
14411441
COMPILE_FLAGS "-mfloat-abi=soft -march=armv7m -mfpu=none"
1442-
MULTILIB_FLAGS "--target=thumbv7m-none-unknown-eabi -mfpu=none"
1442+
MULTILIB_FLAGS "--target=thumbv7m-unknown-none-eabi -mfpu=none"
14431443
QEMU_MACHINE "mps2-an385"
14441444
QEMU_CPU "cortex-m3"
14451445
BOOT_FLASH_ADDRESS 0x00000000
@@ -1454,7 +1454,7 @@ add_library_variants_for_cpu(
14541454
armv7em
14551455
SUFFIX hard_fpv4_sp_d16
14561456
COMPILE_FLAGS "-mfloat-abi=hard -march=armv7em -mfpu=fpv4-sp-d16"
1457-
MULTILIB_FLAGS "--target=thumbv7em-none-unknown-eabihf -mfpu=fpv4-sp-d16"
1457+
MULTILIB_FLAGS "--target=thumbv7em-unknown-none-eabihf -mfpu=fpv4-sp-d16"
14581458
QEMU_MACHINE "mps2-an386"
14591459
QEMU_CPU "cortex-m4"
14601460
BOOT_FLASH_ADDRESS 0x00000000
@@ -1469,7 +1469,7 @@ add_library_variants_for_cpu(
14691469
armv7em
14701470
SUFFIX hard_fpv5_d16
14711471
COMPILE_FLAGS "-mfloat-abi=hard -march=armv7em -mfpu=fpv5-d16"
1472-
MULTILIB_FLAGS "--target=thumbv7em-none-unknown-eabihf -mfpu=fpv5-d16"
1472+
MULTILIB_FLAGS "--target=thumbv7em-unknown-none-eabihf -mfpu=fpv5-d16"
14731473
QEMU_MACHINE "mps2-an500"
14741474
QEMU_CPU "cortex-m7"
14751475
BOOT_FLASH_ADDRESS 0x00000000
@@ -1490,7 +1490,7 @@ add_library_variants_for_cpu(
14901490
armv7em
14911491
SUFFIX soft_nofp
14921492
COMPILE_FLAGS "-mfloat-abi=soft -march=armv7em -mfpu=none"
1493-
MULTILIB_FLAGS "--target=thumbv7em-none-unknown-eabi -mfpu=none"
1493+
MULTILIB_FLAGS "--target=thumbv7em-unknown-none-eabi -mfpu=none"
14941494
QEMU_MACHINE "mps2-an386"
14951495
QEMU_CPU "cortex-m4"
14961496
BOOT_FLASH_ADDRESS 0x00000000
@@ -1505,7 +1505,7 @@ add_library_variants_for_cpu(
15051505
armv8m.main
15061506
SUFFIX soft_nofp
15071507
COMPILE_FLAGS "-mfloat-abi=soft -march=armv8m.main -mfpu=none"
1508-
MULTILIB_FLAGS "--target=thumbv8m.main-none-unknown-eabi -mfpu=none"
1508+
MULTILIB_FLAGS "--target=thumbv8m.main-unknown-none-eabi -mfpu=none"
15091509
QEMU_MACHINE "mps2-an505"
15101510
QEMU_CPU "cortex-m33"
15111511
BOOT_FLASH_ADDRESS 0x10000000
@@ -1520,7 +1520,7 @@ add_library_variants_for_cpu(
15201520
armv8m.main
15211521
SUFFIX hard_fp
15221522
COMPILE_FLAGS "-mfloat-abi=hard -march=armv8m.main -mfpu=fpv5-sp-d16"
1523-
MULTILIB_FLAGS "--target=thumbv8m.main-none-unknown-eabihf -mfpu=fpv5-sp-d16"
1523+
MULTILIB_FLAGS "--target=thumbv8m.main-unknown-none-eabihf -mfpu=fpv5-sp-d16"
15241524
QEMU_MACHINE "mps2-an505"
15251525
QEMU_CPU "cortex-m33"
15261526
BOOT_FLASH_ADDRESS 0x10000000
@@ -1535,7 +1535,7 @@ add_library_variants_for_cpu(
15351535
armv8.1m.main
15361536
SUFFIX soft_nofp_nomve
15371537
COMPILE_FLAGS "-mfloat-abi=soft -march=armv8.1m.main+nomve -mfpu=none"
1538-
MULTILIB_FLAGS "--target=thumbv8.1m.main-none-unknown-eabi -mfpu=none"
1538+
MULTILIB_FLAGS "--target=thumbv8.1m.main-unknown-none-eabi -mfpu=none"
15391539
QEMU_MACHINE "mps3-an547"
15401540
QEMU_CPU "cortex-m55"
15411541
BOOT_FLASH_ADDRESS 0x00000000
@@ -1550,7 +1550,7 @@ add_library_variants_for_cpu(
15501550
armv8.1m.main
15511551
SUFFIX hard_fp_nomve
15521552
COMPILE_FLAGS "-mfloat-abi=hard -march=armv8.1m.main+nomve -mfpu=fp-armv8-fullfp16-sp-d16"
1553-
MULTILIB_FLAGS "--target=thumbv8.1m.main-none-unknown-eabihf -march=thumbv8.1m.main+fp16 -mfpu=fp-armv8-fullfp16-sp-d16"
1553+
MULTILIB_FLAGS "--target=thumbv8.1m.main-unknown-none-eabihf -march=thumbv8.1m.main+fp16 -mfpu=fp-armv8-fullfp16-sp-d16"
15541554
QEMU_MACHINE "mps3-an547"
15551555
QEMU_CPU "cortex-m55"
15561556
BOOT_FLASH_ADDRESS 0x00000000
@@ -1565,7 +1565,7 @@ add_library_variants_for_cpu(
15651565
armv8.1m.main
15661566
SUFFIX hard_fpdp_nomve
15671567
COMPILE_FLAGS "-mfloat-abi=hard -march=armv8.1m.main+nomve -mfpu=fp-armv8-fullfp16-d16"
1568-
MULTILIB_FLAGS "--target=thumbv8.1m.main-none-unknown-eabihf -march=thumbv8.1m.main+fp16 -mfpu=fp-armv8-fullfp16-d16"
1568+
MULTILIB_FLAGS "--target=thumbv8.1m.main-unknown-none-eabihf -march=thumbv8.1m.main+fp16 -mfpu=fp-armv8-fullfp16-d16"
15691569
QEMU_MACHINE "mps3-an547"
15701570
QEMU_CPU "cortex-m55"
15711571
BOOT_FLASH_ADDRESS 0x00000000
@@ -1580,7 +1580,7 @@ add_library_variants_for_cpu(
15801580
armv8.1m.main
15811581
SUFFIX hard_nofp_mve
15821582
COMPILE_FLAGS "-mfloat-abi=hard -march=armv8.1m.main+mve -mfpu=none"
1583-
MULTILIB_FLAGS "--target=thumbv8.1m.main-none-unknown-eabihf -march=thumbv8.1m.main+mve -mfpu=none"
1583+
MULTILIB_FLAGS "--target=thumbv8.1m.main-unknown-none-eabihf -march=thumbv8.1m.main+mve -mfpu=none"
15841584
QEMU_MACHINE "mps3-an547"
15851585
QEMU_CPU "cortex-m55"
15861586
BOOT_FLASH_ADDRESS 0x00000000

‎cmake/multilib.yaml.in

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ Mappings:
5858
# specific variants for.
5959

6060
# v8-M Baseline is a superset of v6-M
61-
- Match: --target=thumbv8m\.base-none-unknown-eabi
61+
- Match: --target=thumbv8m\.base-unknown-none-eabi
6262
Flags:
63-
- --target=thumbv6m-none-unknown-eabi
63+
- --target=thumbv6m-unknown-none-eabi
6464

6565
# v8.2-M Mainline is a superset of v8.1-M Mainline, in both hard and
6666
# soft float variants.
@@ -71,50 +71,50 @@ Mappings:
7171
# combination of them with FPUs, so in some cases it might be
7272
# necessary to fall back to a lower architecture in order to provide
7373
# the needed FPU support.
74-
- Match: --target=thumbv8\.[2-9]m\.main-none-unknown-eabi
74+
- Match: --target=thumbv8\.[2-9]m\.main-unknown-none-eabi
7575
Flags:
76-
- --target=thumbv8.1m.main-none-unknown-eabi
77-
- --target=thumbv8m.main-none-unknown-eabi
78-
- --target=thumbv7em-none-unknown-eabi
79-
- --target=thumbv7m-none-unknown-eabi
80-
- Match: --target=thumbv8\.[2-9]m\.main-none-unknown-eabihf
76+
- --target=thumbv8.1m.main-unknown-none-eabi
77+
- --target=thumbv8m.main-unknown-none-eabi
78+
- --target=thumbv7em-unknown-none-eabi
79+
- --target=thumbv7m-unknown-none-eabi
80+
- Match: --target=thumbv8\.[2-9]m\.main-unknown-none-eabihf
8181
Flags:
82-
- --target=thumbv8.1m.main-none-unknown-eabihf
83-
- --target=thumbv8m.main-none-unknown-eabihf
84-
- --target=thumbv7em-none-unknown-eabihf
85-
- --target=thumbv7m-none-unknown-eabihf
86-
- Match: --target=thumbv8\.1m\.main-none-unknown-eabi
82+
- --target=thumbv8.1m.main-unknown-none-eabihf
83+
- --target=thumbv8m.main-unknown-none-eabihf
84+
- --target=thumbv7em-unknown-none-eabihf
85+
- --target=thumbv7m-unknown-none-eabihf
86+
- Match: --target=thumbv8\.1m\.main-unknown-none-eabi
8787
Flags:
88-
- --target=thumbv8m.main-none-unknown-eabi
89-
- --target=thumbv7em-none-unknown-eabi
90-
- --target=thumbv7m-none-unknown-eabi
91-
- Match: --target=thumbv8\.1m\.main-none-unknown-eabihf
88+
- --target=thumbv8m.main-unknown-none-eabi
89+
- --target=thumbv7em-unknown-none-eabi
90+
- --target=thumbv7m-unknown-none-eabi
91+
- Match: --target=thumbv8\.1m\.main-unknown-none-eabihf
9292
Flags:
93-
- --target=thumbv8m.main-none-unknown-eabihf
94-
- --target=thumbv7em-none-unknown-eabihf
95-
- --target=thumbv7m-none-unknown-eabihf
96-
- Match: --target=thumbv8m\.main-none-unknown-eabi
93+
- --target=thumbv8m.main-unknown-none-eabihf
94+
- --target=thumbv7em-unknown-none-eabihf
95+
- --target=thumbv7m-unknown-none-eabihf
96+
- Match: --target=thumbv8m\.main-unknown-none-eabi
9797
Flags:
98-
- --target=thumbv7em-none-unknown-eabi
99-
- --target=thumbv7m-none-unknown-eabi
100-
- Match: --target=thumbv8m\.main-none-unknown-eabihf
98+
- --target=thumbv7em-unknown-none-eabi
99+
- --target=thumbv7m-unknown-none-eabi
100+
- Match: --target=thumbv8m\.main-unknown-none-eabihf
101101
Flags:
102-
- --target=thumbv7em-none-unknown-eabihf
103-
- --target=thumbv7m-none-unknown-eabihf
104-
- Match: --target=thumbv7em-none-unknown-eabi
102+
- --target=thumbv7em-unknown-none-eabihf
103+
- --target=thumbv7m-unknown-none-eabihf
104+
- Match: --target=thumbv7em-unknown-none-eabi
105105
Flags:
106-
- --target=thumbv7m-none-unknown-eabi
107-
- Match: --target=thumbv7em-none-unknown-eabihf
106+
- --target=thumbv7m-unknown-none-eabi
107+
- Match: --target=thumbv7em-unknown-none-eabihf
108108
Flags:
109-
- --target=thumbv7m-none-unknown-eabihf
109+
- --target=thumbv7m-unknown-none-eabihf
110110

111111
# Higher versions of v8-A, and v9-A, are all supersets of v8-A. (And
112112
# of each other, in the obvious way, but we don't have any libraries
113113
# for those at present, so there's no need to generate all their
114114
# flags.)
115-
- Match: --target=armv(8\.[1-9]|9|9\.[1-9])a-none-unknown-eabi
115+
- Match: --target=armv(8\.[1-9]|9|9\.[1-9])a-unknown-none-eabi
116116
Flags:
117-
- --target=armv8a-none-unknown-eabi
117+
- --target=armv8a-unknown-none-eabi
118118

119119
# -march extensions
120120
- Match: -march=thumbv8\.[1-9]m\.main(\+[^\+]+)*\+fp16(\+[^\+]+)*

0 commit comments

Comments
 (0)