summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTom Hughes <tomhughes@chromium.org>2021-08-30 17:42:00 +0000
committerCommit Bot <commit-bot@chromium.org>2021-08-31 16:56:01 +0000
commit5fa669005c3779b7310bf6bfe43f741a3d8ae871 (patch)
tree076327c058f14bf3dcfea811ca16fc0f1fc3c8e0 /core
parent5a1a08381adff5caee99bdfea8fcb7ca30b31734 (diff)
downloadchrome-ec-5fa669005c3779b7310bf6bfe43f741a3d8ae871.tar.gz
builtin: Add math.h
Add a "math.h" to "builtin" and rename "math.h" in the "core" directories to "fpu.h". "builtin" is the directory containing headers that mirror those in the standard library and is used for device builds. The host builds exclude the "builtin" directory and use the standard library. Without this change, building host tools such as "ectool" and attempting to include "math.h" would result in incorrectly picking up the "math.h" from the device "core" directory, not the standard library version. BRANCH=none BUG=b:144959033 TEST=make buildall Signed-off-by: Tom Hughes <tomhughes@chromium.org> Change-Id: Id6b2df42cb0ff5ec2cfc07aa8f29861da6804bdf Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3130625 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/cortex-m/include/fpu.h (renamed from core/cortex-m/include/math.h)6
-rw-r--r--core/cortex-m0/include/fpu.h (renamed from core/cortex-m0/include/math.h)6
-rw-r--r--core/minute-ia/include/fpu.h (renamed from core/minute-ia/include/math.h)6
-rw-r--r--core/nds32/include/fpu.h (renamed from core/nds32/include/math.h)6
-rw-r--r--core/riscv-rv32i/include/fpu.h (renamed from core/riscv-rv32i/include/math.h)6
5 files changed, 15 insertions, 15 deletions
diff --git a/core/cortex-m/include/math.h b/core/cortex-m/include/fpu.h
index 1b336eb2aa..0949d336e2 100644
--- a/core/cortex-m/include/math.h
+++ b/core/cortex-m/include/fpu.h
@@ -5,8 +5,8 @@
/* Math utility functions for ARMv7 */
-#ifndef __CROS_EC_MATH_H
-#define __CROS_EC_MATH_H
+#ifndef __CROS_EC_FPU_H
+#define __CROS_EC_FPU_H
#ifdef CONFIG_FPU
static inline float sqrtf(float v)
@@ -32,4 +32,4 @@ static inline float fabsf(float v)
}
#endif /* CONFIG_FPU */
-#endif /* __CROS_EC_MATH_H */
+#endif /* __CROS_EC_FPU_H */
diff --git a/core/cortex-m0/include/math.h b/core/cortex-m0/include/fpu.h
index 4c8955e74d..3acec557a7 100644
--- a/core/cortex-m0/include/math.h
+++ b/core/cortex-m0/include/fpu.h
@@ -5,7 +5,7 @@
/* Math utility functions for ARMv6-M */
-#ifndef __CROS_EC_MATH_H
-#define __CROS_EC_MATH_H
+#ifndef __CROS_EC_FPU_H
+#define __CROS_EC_FPU_H
-#endif /* __CROS_EC_MATH_H */
+#endif /* __CROS_EC_FPU_H */
diff --git a/core/minute-ia/include/math.h b/core/minute-ia/include/fpu.h
index 00f73ccaa1..fbcc7ae0f0 100644
--- a/core/minute-ia/include/math.h
+++ b/core/minute-ia/include/fpu.h
@@ -5,8 +5,8 @@
/* Math utility functions for minute-IA */
-#ifndef __CROS_EC_MATH_H
-#define __CROS_EC_MATH_H
+#ifndef __CROS_EC_FPU_H
+#define __CROS_EC_FPU_H
#include "config.h"
@@ -238,4 +238,4 @@ static inline int __isinff(float v)
}
#endif /* CONFIG_FPU */
-#endif /* __CROS_EC_MATH_H */
+#endif /* __CROS_EC_FPU_H */
diff --git a/core/nds32/include/math.h b/core/nds32/include/fpu.h
index 49d5585657..4f3efc2e5a 100644
--- a/core/nds32/include/math.h
+++ b/core/nds32/include/fpu.h
@@ -5,10 +5,10 @@
/* Math utility functions for N8 */
-#ifndef __CROS_EC_MATH_H
-#define __CROS_EC_MATH_H
+#ifndef __CROS_EC_FPU_H
+#define __CROS_EC_FPU_H
float sqrtf(float x);
float fabsf(float x);
-#endif /* __CROS_EC_MATH_H */
+#endif /* __CROS_EC_FPU_H */
diff --git a/core/riscv-rv32i/include/math.h b/core/riscv-rv32i/include/fpu.h
index f17144762a..25d83f228f 100644
--- a/core/riscv-rv32i/include/math.h
+++ b/core/riscv-rv32i/include/fpu.h
@@ -5,9 +5,9 @@
/* Math utility functions for RISC-V */
-#ifndef __CROS_EC_MATH_H
-#define __CROS_EC_MATH_H
+#ifndef __CROS_EC_FPU_H
+#define __CROS_EC_FPU_H
float sqrtf(float x);
-#endif /* __CROS_EC_MATH_H */
+#endif /* __CROS_EC_FPU_H */