lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-10-27 12:15:39 +03:00
Code Activity

Force use of -ffreestanding when checking for gnumach headers

Browse Source 
Without this ./configure assumes that we are in a fully hosted
environment, which might not be the case. After this patch, we can rely on
the freestanding header files provided by GCC such as stdint.h.
Message-Id: <Y5+0V9osFc/zXMq0@mars>
This commit is contained in:
Flavio Cruz
2022-12-18 19:46:15 -05:00
committed by Samuel Thibault
parent 71e408e45d
commit 8b8c768e3c
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sysdeps/mach/configure vendored
View File

@@ -133,6 +133,8 @@ if test -n "$sysheaders"; then
fi fi
### Sanity checks for Mach header installation ### Sanity checks for Mach header installation
old_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -ffreestanding"
ac_fn_c_check_header_preproc "$LINENO" "mach/mach_types.h" "ac_cv_header_mach_mach_types_h" ac_fn_c_check_header_preproc "$LINENO" "mach/mach_types.h" "ac_cv_header_mach_mach_types_h"
@@ -143,6 +145,7 @@ else
fi fi
CFLAGS=$old_CFLAGS
ac_fn_c_check_header_preproc "$LINENO" "mach/mach_types.defs" "ac_cv_header_mach_mach_types_defs" ac_fn_c_check_header_preproc "$LINENO" "mach/mach_types.defs" "ac_cv_header_mach_mach_types_defs"
if test "x$ac_cv_header_mach_mach_types_defs" = xyes; then : if test "x$ac_cv_header_mach_mach_types_defs" = xyes; then :
@@ -216,7 +219,9 @@ $as_echo_n "checking for creation_time in task_basic_info... " >&6; }
if ${libc_cv_mach_task_creation_time+:} false; then : if ${libc_cv_mach_task_creation_time+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext old_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -ffreestanding"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include <mach/task_info.h> #include <mach/task_info.h>
int int
@@ -242,6 +247,7 @@ $as_echo "$libc_cv_mach_task_creation_time" >&6; }
if test $libc_cv_mach_task_creation_time = no; then if test $libc_cv_mach_task_creation_time = no; then
as_fn_error $? "you need Mach headers supporting task_info.creation_time" "$LINENO" 5 as_fn_error $? "you need Mach headers supporting task_info.creation_time" "$LINENO" 5
fi fi
CFLAGS=$old_CFLAGS
mach_interface_list= mach_interface_list=
for ifc in mach mach4 gnumach \ for ifc in mach mach4 gnumach \

6
sysdeps/mach/configure.ac
View File

@@ -12,8 +12,11 @@ if test -n "$sysheaders"; then
fi fi
### Sanity checks for Mach header installation ### Sanity checks for Mach header installation
old_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -ffreestanding"
AC_CHECK_HEADER(mach/mach_types.h,, AC_CHECK_HEADER(mach/mach_types.h,,
[AC_MSG_ERROR([cannot find Mach headers])], -) [AC_MSG_ERROR([cannot find Mach headers])], -)
CFLAGS=$old_CFLAGS
AC_CHECK_HEADER(mach/mach_types.defs,, [dnl AC_CHECK_HEADER(mach/mach_types.defs,, [dnl
AC_MSG_ERROR([cannot find Mach .defs files])], -) AC_MSG_ERROR([cannot find Mach .defs files])], -)
@@ -42,6 +45,8 @@ dnl The creation_time field is a GNU Mach addition the other variants lack.
dnl dnl
AC_CACHE_CHECK(for creation_time in task_basic_info, AC_CACHE_CHECK(for creation_time in task_basic_info,
libc_cv_mach_task_creation_time, [dnl libc_cv_mach_task_creation_time, [dnl
old_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -ffreestanding"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <mach/task_info.h>]], [[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <mach/task_info.h>]], [[
extern struct task_basic_info *i; extern struct task_basic_info *i;
long s = i->creation_time.seconds; long s = i->creation_time.seconds;
@@ -49,6 +54,7 @@ long s = i->creation_time.seconds;
if test $libc_cv_mach_task_creation_time = no; then if test $libc_cv_mach_task_creation_time = no; then
AC_MSG_ERROR([you need Mach headers supporting task_info.creation_time]) AC_MSG_ERROR([you need Mach headers supporting task_info.creation_time])
fi fi
CFLAGS=$old_CFLAGS
dnl dnl
dnl The Darwin variant no longer has <mach/mach.defs> dnl The Darwin variant no longer has <mach/mach.defs>