diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-01-17 15:22:50 +0100 |
|---|---|---|
| committer | Oded Gabbay <oded.gabbay@gmail.com> | 2016-01-31 16:15:26 +0200 |
| commit | 7c6066b700c7cdd4aeb8be426b14b3a5f0de4b6c (patch) | |
| tree | ada5030d57244ae8300aeb2ddbe5babeb42afee1 | |
| parent | 342cbf1644125919c51ab099e434951429e66411 (diff) | |
pixman-private: include <float.h> only in C code
<float.h> is included unconditionally by pixman-private.h, which in
turn gets included by assembler files. Unfortunately, with certain C
libraries (like the musl C library), <float.h> cannot be included in
assembler files:
CCLD libpixman-arm-simd.la
/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages:
/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)'
/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages:
/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)'
It turns out however that <float.h> is not needed by assembly files,
so we move its inclusion within the #ifndef __ASSEMBLER__ condition,
which solves the problem.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
| -rw-r--r-- | pixman/pixman-private.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h index 73108a0..73a5414 100644 --- a/pixman/pixman-private.h +++ b/pixman/pixman-private.h @@ -1,5 +1,3 @@ -#include <float.h> - #ifndef PIXMAN_PRIVATE_H #define PIXMAN_PRIVATE_H @@ -30,6 +28,7 @@ #include <stdio.h> #include <string.h> #include <stddef.h> +#include <float.h> #include "pixman-compiler.h" |