Skip to content

Commit a53a754

Browse files
vrukeshvrukesh
authored
Shorten folder name for exceptions for llvm-18 (#419)
Co-authored-by: Vrukesh V Panse <[email protected]>
1 parent dedbfb2 commit a53a754

File tree

12 files changed

+27
-27
lines changed

12 files changed

+27
-27
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1257,7 +1257,7 @@ function(add_library_variants_for_cpu target_arch)
12571257
list(APPEND SUFFIXES ${VARIANT_SUFFIX})
12581258
endif()
12591259
if(enable_exceptions_and_rtti)
1260-
list(APPEND SUFFIXES "exceptions")
1260+
list(APPEND SUFFIXES "exn")
12611261
list(APPEND SUFFIXES "rtti")
12621262
endif()
12631263
list(JOIN SUFFIXES "_" COMBINED_SUFFIX)

‎test-support/picolibc-test-wrapper.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
"picolibc_armv7m_soft_fpv4_sp_d16-build/test/math_errhandling",
2020
"picolibc_armv7em_hard_fpv4_sp_d16-build/test/math_errhandling",
2121
"picolibc_armv8.1m.main_hard_fp_nomve-build/test/math_errhandling",
22-
"picolibc_armv7m_soft_fpv4_sp_d16_exceptions_rtti-build/test/math_errhandling",
23-
"picolibc_armv7em_hard_fpv4_sp_d16_exceptions_rtti-build/test/math_errhandling",
24-
"picolibc_armv8.1m.main_hard_fp_nomve_exceptions_rtti-build/test/math_errhandling",
22+
"picolibc_armv7m_soft_fpv4_sp_d16_exn_rtti-build/test/math_errhandling",
23+
"picolibc_armv7em_hard_fpv4_sp_d16_exn_rtti-build/test/math_errhandling",
24+
"picolibc_armv8.1m.main_hard_fp_nomve_exn_rtti-build/test/math_errhandling",
2525
"picolibc_armv8.1m.main_hard_nofp_mve-build/test/fenv",
2626
"picolibc_armv8.1m.main_hard_nofp_mve-build/test/math_errhandling",
2727
"picolibc_armv8m.main_hard_fp-build/test/math_errhandling",
28-
"picolibc_armv8.1m.main_hard_nofp_mve_exceptions_rtti-build/test/fenv",
29-
"picolibc_armv8.1m.main_hard_nofp_mve_exceptions_rtti-build/test/math_errhandling",
30-
"picolibc_armv8m.main_hard_fp_exceptions_rtti-build/test/math_errhandling",
28+
"picolibc_armv8.1m.main_hard_nofp_mve_exn_rtti-build/test/fenv",
29+
"picolibc_armv8.1m.main_hard_nofp_mve_exn_rtti-build/test/math_errhandling",
30+
"picolibc_armv8m.main_hard_fp_exn_rtti-build/test/math_errhandling",
3131
]
3232

3333

‎test/multilib/aarch64.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# RUN: %clang -print-multi-directory --target=aarch64-none-elf | FileCheck %s
2-
# CHECK: aarch64-none-elf/aarch64_exceptions_rtti{{$}}
2+
# CHECK: aarch64-none-elf/aarch64_exn_rtti{{$}}
33
# CHECK-EMPTY:

‎test/multilib/armv4t.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# RUN: %clang -print-multi-directory --target=arm-none-eabi -mfpu=none | FileCheck %s
2-
# CHECK: arm-none-eabi/armv4t_exceptions_rtti{{$}}
2+
# CHECK: arm-none-eabi/armv4t_exn_rtti{{$}}
33
# CHECK-EMPTY:

‎test/multilib/armv5e.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# RUN: %clang -print-multi-directory --target=armv5e-none-eabi -mfpu=none | FileCheck %s
2-
# CHECK: arm-none-eabi/armv5te_exceptions_rtti{{$}}
2+
# CHECK: arm-none-eabi/armv5te_exn_rtti{{$}}
33
# CHECK-EMPTY:

‎test/multilib/armv6m.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# RUN: %clang -print-multi-directory --target=armv6m-none-eabi -mfpu=none | FileCheck %s
2-
# CHECK: arm-none-eabi/armv6m_soft_nofp_exceptions_rtti{{$}}
2+
# CHECK: arm-none-eabi/armv6m_soft_nofp_exn_rtti{{$}}
33
# CHECK-EMPTY:

‎test/multilib/armv7a.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# RUN: %clang -print-multi-directory --target=armv7a-none-eabi -mfpu=none | FileCheck %s
2-
# CHECK: arm-none-eabi/armv7a_soft_nofp_exceptions_rtti{{$}}
2+
# CHECK: arm-none-eabi/armv7a_soft_nofp_exn_rtti{{$}}
33
# CHECK-EMPTY:
44

55
# RUN: %clang -print-multi-directory --target=armv7a-none-eabihf -mfpu=vfpv3-d16 | FileCheck --check-prefix=VFPV3 %s
@@ -11,7 +11,7 @@
1111
# RUN: %clang -print-multi-directory --target=armv7a-none-eabihf -mfpu=vfpv4 | FileCheck --check-prefix=VFPV3 %s
1212
# RUN: %clang -print-multi-directory --target=armv7a-none-eabihf -mfpu=neon-fp16 | FileCheck --check-prefix=VFPV3 %s
1313
# RUN: %clang -print-multi-directory --target=armv7a-none-eabihf -mfpu=neon-vfpv4 | FileCheck --check-prefix=VFPV3 %s
14-
# VFPV3: arm-none-eabi/armv7a_hard_vfpv3_d16_exceptions_rtti{{$}}
14+
# VFPV3: arm-none-eabi/armv7a_hard_vfpv3_d16_exn_rtti{{$}}
1515
# VFPV3-EMPTY:
1616

1717
# We have no valid variant for this configuration, yet.

‎test/multilib/armv7em.test‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# RUN: %clang -print-multi-directory --target=armv7em-none-eabi -mfpu=none | FileCheck %s
2-
# CHECK: arm-none-eabi/armv7em_soft_nofp_exceptions_rtti{{$}}
2+
# CHECK: arm-none-eabi/armv7em_soft_nofp_exn_rtti{{$}}
33
# CHECK-EMPTY:
44

55
# RUN: %clang -print-multi-directory --target=armv7em-none-eabihf -mfpu=fpv4-sp-d16 | FileCheck --check-prefix=FPV4 %s
6-
# FPV4: arm-none-eabi/armv7em_hard_fpv4_sp_d16_exceptions_rtti{{$}}
6+
# FPV4: arm-none-eabi/armv7em_hard_fpv4_sp_d16_exn_rtti{{$}}
77
# FPV4-EMPTY:
88

99
# RUN: %clang -print-multi-directory --target=armv7em-none-eabihf -mfpu=fpv5-d16 | FileCheck --check-prefix=FPV5 %s
10-
# FPV5: arm-none-eabi/armv7em_hard_fpv5_d16_exceptions_rtti{{$}}
10+
# FPV5: arm-none-eabi/armv7em_hard_fpv5_d16_exn_rtti{{$}}
1111
# FPV5-EMPTY:

‎test/multilib/armv7m.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# RUN: %clang -print-multi-directory --target=armv7m-none-eabi -mfpu=none | FileCheck %s
22
# RUN: %clang -print-multi-directory --target=armv7m-none-eabi -mfpu=none -mfloat-abi=softfp | FileCheck %s
3-
# CHECK: arm-none-eabi/armv7m_soft_nofp_exceptions_rtti{{$}}
3+
# CHECK: arm-none-eabi/armv7m_soft_nofp_exn_rtti{{$}}
44
# CHECK-EMPTY:
55

66
# RUN: %clang -print-multi-directory --target=armv7m-none-eabi -mfpu=fpv4-sp-d16 -mfloat-abi=softfp | FileCheck --check-prefix=SOFT-FPV4 %s
77
# RUN: %clang -print-multi-directory --target=armv7m-none-eabi -mfpu=fpv5-d16 -mfloat-abi=softfp | FileCheck --check-prefix=SOFT-FPV4 %s
8-
# SOFT-FPV4: arm-none-eabi/armv7m_soft_fpv4_sp_d16_exceptions_rtti{{$}}
8+
# SOFT-FPV4: arm-none-eabi/armv7m_soft_fpv4_sp_d16_exn_rtti{{$}}
99
# SOFT-FPV4-EMPTY:

‎test/multilib/armv7r.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# RUN: %clang -print-multi-directory --target=armv7r-none-eabi -mfpu=none | FileCheck %s
2-
# CHECK: arm-none-eabi/armv7r_soft_nofp_exceptions_rtti{{$}}
2+
# CHECK: arm-none-eabi/armv7r_soft_nofp_exn_rtti{{$}}
33
# CHECK-EMPTY:
44

55
# RUN: %clang -print-multi-directory --target=armv7r-none-eabihf -mfpu=vfpv3-d16 | FileCheck --check-prefix=VFPV3 %s
6-
# VFPV3: arm-none-eabi/armv7r_hard_vfpv3_d16_exceptions_rtti{{$}}
6+
# VFPV3: arm-none-eabi/armv7r_hard_vfpv3_d16_exn_rtti{{$}}
77
# VFPV3-EMPTY:

0 commit comments

Comments
 (0)