Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions bazel/config/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -330,3 +330,9 @@ bool_flag(
name = "PICO_COMPILATION_NO_FASTBUILD_ARGS",
build_setting_default = False,
)

# PICO_BAZEL_CONFIG: PICO_HARD_FLOAT_ABI, use hard floating point ABI, type=bool, default=0, group=build, docref=cmake-toolchain-config
bool_flag(
name = "PICO_HARD_FLOAT_ABI",
build_setting_default = False,
)
5 changes: 5 additions & 0 deletions bazel/constraint/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,11 @@ config_setting(
flag_values = {"//bazel/config:PICO_COMPILATION_NO_FASTBUILD_ARGS": "True"},
)

config_setting(
name = "pico_hard_float_abi_enabled",
flag_values = {"//bazel/config:PICO_HARD_FLOAT_ABI": "True"},
)

config_setting(
name = "pico_binary_type_no_flash",
flag_values = {"//bazel/config:PICO_DEFAULT_BINARY_TYPE": "no_flash"},
Expand Down
6 changes: 4 additions & 2 deletions bazel/toolchain/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@ cc_args(
args = [
"-mcpu=cortex-m33",
"-march=armv8-m.main+fp+dsp",
"-mfloat-abi=softfp",
"-mthumb",
"-mcmse",
],
] + select({
"//bazel/constraint:pico_hard_float_abi_enabled": ["-mfloat-abi=hard"],
"//conditions:default": ["-mfloat-abi=softfp"],
}),
)

# :no_canonical_system_headers and :no_canonical_prefixes both prevent built-in
Expand Down
2 changes: 1 addition & 1 deletion src/rp2_common/pico_double/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ alias(
actual = select({
"//bazel/constraint:pico_double_auto_enabled": ":pico_double_auto",
"//bazel/constraint:pico_double_compiler_enabled": ":pico_double_auto",
"//bazel/constraint:pico_double_dcp_enabled": ":pico_double_pico",
"//bazel/constraint:pico_double_dcp_enabled": ":pico_double_dcp",
"//bazel/constraint:pico_double_rp2040_enabled": ":pico_double_pico",
"//conditions:default": ":pico_double_none",
}),
Expand Down
7 changes: 5 additions & 2 deletions src/rp2_common/pico_float/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ _PICO_FLOAT_IMPLS = [
"float_math.c",
"float_sci_m33.S",
],
"compatibility": compatible_with_rp2() + incompatible_with_config("@platforms//cpu:riscv32") + incompatible_with_config("//bazel/constraint:rp2040"),
"compatibility": compatible_with_rp2() + incompatible_with_config("@platforms//cpu:riscv32") + incompatible_with_config("//bazel/constraint:rp2040") + incompatible_with_config("//bazel/constraint:pico_hard_float_abi_enabled"),
"extra_deps": ["//src/rp2_common/hardware_dcp"],
"linkopts": _WRAP_FLOAT_AEABI_ARITHMETIC_FLAGS + _WRAP_FLOAT_AEABI_CMP_FLAGS + _WRAP_FLOAT_AEABI_CONV_32_FLAGS + _WRAP_FLOAT_AEABI_CONV_64_FLAGS + _WRAP_FLOAT_AEABI_CONV_DOUBLE_FLAGS + _WRAP_FLOAT_SQRTF_FLAGS + _WRAP_FLOAT_SCI_FLAGS + _WRAP_FLOAT_SCI_EXTRA_FLAGS + _WRAP_FLOAT_FMAF_FLAGS + _WRAP_FLOAT_FMAF_FLAGS,
},
Expand Down Expand Up @@ -207,7 +207,10 @@ cc_library(
hdrs = ["include/pico/float.h"],
defines = ["LIB_PICO_FLOAT_PICO=0"],
includes = ["include"],
linkopts = _WRAP_FLOAT_AEABI_ARITHMETIC_FLAGS + _WRAP_FLOAT_AEABI_CMP_FLAGS + _WRAP_FLOAT_AEABI_CONV_32_FLAGS + _WRAP_FLOAT_AEABI_CONV_64_FLAGS + _WRAP_FLOAT_AEABI_CONV_DOUBLE_FLAGS + _WRAP_FLOAT_SQRTF_FLAGS + _WRAP_FLOAT_SCI_FLAGS + _WRAP_FLOAT_SCI_EXTRA_FLAGS,
linkopts = select({
"//bazel/constraint:pico_hard_float_abi_enabled": [],
"//conditions:default": _WRAP_FLOAT_AEABI_ARITHMETIC_FLAGS + _WRAP_FLOAT_AEABI_CMP_FLAGS + _WRAP_FLOAT_AEABI_CONV_32_FLAGS + _WRAP_FLOAT_AEABI_CONV_64_FLAGS + _WRAP_FLOAT_AEABI_CONV_DOUBLE_FLAGS + _WRAP_FLOAT_SQRTF_FLAGS + _WRAP_FLOAT_SCI_FLAGS + _WRAP_FLOAT_SCI_EXTRA_FLAGS,
}),
target_compatible_with = compatible_with_rp2(),
visibility = ["//visibility:private"],
deps = [
Expand Down
Loading