Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From 154af50ed7ed8b91838d713052ebf29b0b14f765 Mon Sep 17 00:00:00 2001 |
| 2 | From: Andre McCurdy <armccurdy@gmail.com> |
| 3 | Date: Mon, 18 Jan 2016 11:00:00 -0800 |
| 4 | Subject: [PATCH] mpers.m4: more robust test for -m32/-mx32 compile support |
| 5 | |
| 6 | When using the default OE toolchain for x86-64, the basic checks for |
| 7 | -m32 and -mx32 compile support in mpers.m4 pass but later attempts to |
| 8 | actually use the toolchain with -m32 fail, e.g. |
| 9 | |
| 10 | | In file included from /home/andre/build/tmp/sysroots/qemux86-64/usr/include/sys/syscall.h:31:0, |
| 11 | | from ../strace-4.11/defs.h:55, |
| 12 | | from mpers-m32/kernel_dirent.c:32: |
| 13 | | /home/andre/build/tmp/sysroots/qemux86-64/usr/include/bits/syscall.h:41:29: fatal error: bits/syscall-32.h: No such file or directory |
| 14 | |
| 15 | Make the mpers.m4 tests more robust so that configure correctly |
| 16 | detects the limitations of the OE toolchain. |
| 17 | |
| 18 | Upstream-Status: Pending |
| 19 | |
| 20 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
| 21 | --- |
| 22 | m4/mpers.m4 | 2 ++ |
| 23 | 1 file changed, 2 insertions(+) |
| 24 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 25 | Index: strace-4.22/m4/mpers.m4 |
| 26 | =================================================================== |
| 27 | --- strace-4.22.orig/m4/mpers.m4 |
| 28 | +++ strace-4.22/m4/mpers.m4 |
| 29 | @@ -108,6 +108,7 @@ case "$arch" in |
| 30 | CFLAGS="$CFLAGS MPERS_CFLAGS $IFLAG" |
| 31 | AC_CACHE_CHECK([for mpers_name personality compile support], [st_cv_cc], |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 32 | [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stdint.h> |
| 33 | + #include <sys/syscall.h> |
| 34 | int main(){return 0;}]])], |
| 35 | [st_cv_cc=yes], |
| 36 | [st_cv_cc=no])]) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 37 | @@ -115,6 +116,7 @@ case "$arch" in |
| 38 | AC_CACHE_CHECK([for mpers_name personality runtime support], |
| 39 | [st_cv_runtime], |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 40 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdint.h> |
| 41 | + #include <sys/syscall.h> |
| 42 | int main(){return 0;}]])], |
| 43 | [st_cv_runtime=yes], |
| 44 | [st_cv_runtime=no], |