Skip to content

Commit

Permalink
Add missing armv7 library variants.
Browse files Browse the repository at this point in the history
    This patch adds the following library variants.

            1. armv7r hard_vfpv3xd
            2. armv7a soft_vfpv3_d16.

   Also disable the math_errhandling tests to the set of disabled
   tests for the armv7r_hard_vfpv3xd library variant.These tests were
   already disabled for the previously existing variants, due to a known
   issue in compiler-rt where the floating point exceptions are not set
   correctly for computations on types implemented in software.
  • Loading branch information
simpal01 committed Sep 4, 2024
1 parent 5a315d2 commit bd1410a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1605,7 +1605,7 @@ add_library_variants_for_cpu(
)
add_library_variants_for_cpu(
armv7a
SUFFIX softfp_vfpv3_d16
SUFFIX soft_vfpv3_d16
COMPILE_FLAGS "-mfloat-abi=softfp -march=armv7a -mfpu=vfpv3-d16"
MULTILIB_FLAGS "--target=armv7-unknown-none-eabi -mfpu=vfpv3-d16"
PICOLIBC_BUILD_TYPE "release"
Expand Down Expand Up @@ -1656,9 +1656,9 @@ add_library_variants_for_cpu(
)
add_library_variants_for_cpu(
armv7r
SUFFIX soft_vfpv3_d16
COMPILE_FLAGS "-mfloat-abi=soft -march=armv7r -mfpu=vfpv3-d16"
MULTILIB_FLAGS "--target=armv7r-unknown-none-eabihf -mfpu=vfpv3-d16"
SUFFIX hard_vfpv3xd
COMPILE_FLAGS "-mfloat-abi=hard -march=armv7r -mfpu=vfpv3xd"
MULTILIB_FLAGS "--target=armv7r-unknown-none-eabihf -mfpu=vfpv3xd"
PICOLIBC_BUILD_TYPE "release"
QEMU_MACHINE "none"
QEMU_CPU "cortex-r5f"
Expand Down
2 changes: 2 additions & 0 deletions test-support/picolibc-test-wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
# https://github.com/picolibc/picolibc/pull/500
"picolibc_armv7m_soft_fpv4_sp_d16-build/test/math_errhandling",
"picolibc_armv7m_hard_fpv4_sp_d16-build/test/math_errhandling",
"picolibc_armv7r_hard_vfpv3xd-build/test/math_errhandling",
"picolibc_armv7r_hard_vfpv3xd_exn_rtti-build/test/math_errhandling",
"picolibc_armv8.1m.main_hard_fp_nomve-build/test/math_errhandling",
"picolibc_armv7m_soft_fpv4_sp_d16_exn_rtti-build/test/math_errhandling",
"picolibc_armv7m_hard_fpv4_sp_d16_exn_rtti-build/test/math_errhandling",
Expand Down

0 comments on commit bd1410a

Please sign in to comment.