diff options
| author | Mark Hatle <mark.hatle@xilinx.com> | 2020-02-04 15:06:29 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-06 12:16:34 +0000 |
| commit | d6b0154a4c1e897d6cd2f815c13ad9d6f34c1355 (patch) | |
| tree | fd67490088e32b8cacdbf670f83806854631a5b9 /meta/conf/machine/include/microblaze/feature-microblaze-math.inc | |
| parent | 83e58868b5fcd3846d81ec04f0b7b1751b4ca0d0 (diff) | |
| download | poky-d6b0154a4c1e897d6cd2f815c13ad9d6f34c1355.tar.gz | |
microblaze tune: cleanup +=
Various += were used, refactor these to be either = or .= depending on
usuage.
CONFLICTS should be '=', as no leading space is required and they are not
amending any other conflict settings.
The TUNE_CCARGS should be .= so that if the feature does not define a CCARG
blank spaces are not added to the CFLAGS. This is consistent to how the arm
tuning is implemented.
(From OE-Core rev: 78c38857486d3107ecd95d0ceefabcf5152c3928)
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/include/microblaze/feature-microblaze-math.inc')
| -rw-r--r-- | meta/conf/machine/include/microblaze/feature-microblaze-math.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc index a31516659c..cba0ae67e3 100644 --- a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc +++ b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc | |||
| @@ -13,14 +13,14 @@ TUNECONFLICTS[fpu-hard] = "fpu-soft" | |||
| 13 | TUNECONFLICTS[fpu-hard-extended] = "fpu-soft" | 13 | TUNECONFLICTS[fpu-hard-extended] = "fpu-soft" |
| 14 | 14 | ||
| 15 | # Compiler args | 15 | # Compiler args |
| 16 | TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], '-mno-xl-soft-mul', '-mxl-soft-mul', d)}" | 16 | TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], ' -mno-xl-soft-mul', ' -mxl-soft-mul', d)}" |
| 17 | TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', '-mxl-multiply-high', '', d)}" | 17 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', ' -mxl-multiply-high', '', d)}" |
| 18 | 18 | ||
| 19 | TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', '-mno-xl-soft-div', '-mxl-soft-div', d)}" | 19 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', ' -mno-xl-soft-div', ' -mxl-soft-div', d)}" |
| 20 | 20 | ||
| 21 | TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" | 21 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" |
| 22 | TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], '-mhard-float', '', d)}" | 22 | TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], ' -mhard-float', '', d)}" |
| 23 | TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', '-mxl-float-convert -mxl-float-sqrt', '', d)}" | 23 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', ' -mxl-float-convert -mxl-float-sqrt', '', d)}" |
| 24 | 24 | ||
| 25 | # Set target fpu (bitbake known target) to soft or hard (basic or extended) | 25 | # Set target fpu (bitbake known target) to soft or hard (basic or extended) |
| 26 | TARGET_FPU = "${@bb.utils.contains_any('TUNE_FEATURES', 'fpu-hard fpu-hard-extended', 'fpu-hard', 'fpu-soft', d)}" | 26 | TARGET_FPU = "${@bb.utils.contains_any('TUNE_FEATURES', 'fpu-hard fpu-hard-extended', 'fpu-hard', 'fpu-soft', d)}" |