From patchwork Mon Dec 19 00:50:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 1717059 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Nb1N93qBzz23yr for ; Mon, 19 Dec 2022 11:50:48 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 781EF38EF1F6 for ; Mon, 19 Dec 2022 00:50:40 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 1DCB938CE146 for ; Mon, 19 Dec 2022 00:50:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1DCB938CE146 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 2183820187; Mon, 19 Dec 2022 01:50:24 +0100 (CET) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZiBGyn-ehJWk; Mon, 19 Dec 2022 01:50:24 +0100 (CET) Received: from begin (lfbn-bor-1-376-208.w109-215.abo.wanadoo.fr [109.215.91.208]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id EC4DF20185; Mon, 19 Dec 2022 01:50:23 +0100 (CET) Received: from samy by begin with local (Exim 4.96) (envelope-from ) id 1p74MJ-00EWFD-1U; Mon, 19 Dec 2022 01:50:23 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Flavio Cruz , commit-hurd@gnu.org Subject: [hurd, commited] Force use of -ffreestanding when checking for gnumach headers Date: Mon, 19 Dec 2022 01:50:23 +0100 Message-Id: <20221219005023.3460532-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" From: Flavio Cruz 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: --- sysdeps/mach/configure | 8 +++++++- sysdeps/mach/configure.ac | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sysdeps/mach/configure b/sysdeps/mach/configure index 739f1028a4..36f556a663 100644 --- a/sysdeps/mach/configure +++ b/sysdeps/mach/configure @@ -133,6 +133,8 @@ if test -n "$sysheaders"; then fi ### 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" @@ -143,6 +145,7 @@ else fi +CFLAGS=$old_CFLAGS 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 : @@ -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 : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + old_CFLAGS=$CFLAGS +CFLAGS="$CFLAGS -ffreestanding" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -242,6 +247,7 @@ $as_echo "$libc_cv_mach_task_creation_time" >&6; } if test $libc_cv_mach_task_creation_time = no; then as_fn_error $? "you need Mach headers supporting task_info.creation_time" "$LINENO" 5 fi +CFLAGS=$old_CFLAGS mach_interface_list= for ifc in mach mach4 gnumach \ diff --git a/sysdeps/mach/configure.ac b/sysdeps/mach/configure.ac index 61b00d66b1..5816c3d4ad 100644 --- a/sysdeps/mach/configure.ac +++ b/sysdeps/mach/configure.ac @@ -12,8 +12,11 @@ if test -n "$sysheaders"; then fi ### Sanity checks for Mach header installation +old_CFLAGS=$CFLAGS +CFLAGS="$CFLAGS -ffreestanding" AC_CHECK_HEADER(mach/mach_types.h,, [AC_MSG_ERROR([cannot find Mach headers])], -) +CFLAGS=$old_CFLAGS AC_CHECK_HEADER(mach/mach_types.defs,, [dnl 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 AC_CACHE_CHECK(for creation_time in task_basic_info, libc_cv_mach_task_creation_time, [dnl +old_CFLAGS=$CFLAGS +CFLAGS="$CFLAGS -ffreestanding" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ extern struct task_basic_info *i; 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 AC_MSG_ERROR([you need Mach headers supporting task_info.creation_time]) fi +CFLAGS=$old_CFLAGS dnl dnl The Darwin variant no longer has