From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id 98B9C385702B; Wed, 10 May 2023 23:28:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 98B9C385702B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683761325; bh=2n5W3rjgGBsdOFt4vNWlRZZpbiTNIljHIHowvuM9lC0=; h=From:To:Subject:Date:From; b=PQwJ6k6B8+1ypRM2wCI/GtLH4jCY0N1J66VlcRwUvgnzCScJh7LeIKU+6l/zsA9tK WrMMcX+PXvkjmPMAzmpBD99gLWG/TsS3iC51kIjMvs07Xdf5jmORe+4xM9wC9snJfQ Mn2OQ4/7hdLWYEjc8Lw16NLjUQcguf2KoFQW16VU= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] Stop checking if MiG supports retcode. X-Act-Checkin: glibc X-Git-Author: Flavio Cruz X-Git-Refname: refs/heads/master X-Git-Oldrev: 1a57ab0c923f269d1d7c29dfe4634c0ae66d69ac X-Git-Newrev: 3ca9f43d1007956251130ee5a59abb63bff8a6b6 Message-Id: <20230510232845.98B9C385702B@sourceware.org> Date: Wed, 10 May 2023 23:28:45 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3ca9f43d1007956251130ee5a59abb63bff8a6b6 commit 3ca9f43d1007956251130ee5a59abb63bff8a6b6 Author: Flavio Cruz Date: Wed May 10 01:20:34 2023 -0400 Stop checking if MiG supports retcode. We already did the same change for Hurd (https://git.savannah.gnu.org/cgit/hurd/hurd.git/commit/?id=ef5924402864ef049f40a39e73967628583bc1a4) Due to MiG requiring the subsystem to be defined early in order to know the size of a port, this was causing a division by zero error during ./configure. We could have just move subsystem to the top of the snippet, however it is simpler to just remove the check given that we have no plans to use some other MiG anyway. HAVE_MIG_RETCODE is removed completely since this will be a no-op either way (compiling against old Hurd headers will work the same, new Hurd headers will result in the same stubs since retcode is a no-op). Message-Id: Diff: --- config.h.in | 3 --- sysdeps/mach/configure | 36 ------------------------------------ sysdeps/mach/configure.ac | 26 -------------------------- 3 files changed, 65 deletions(-) diff --git a/config.h.in b/config.h.in index c87008b6a9..44a34072a4 100644 --- a/config.h.in +++ b/config.h.in @@ -150,9 +150,6 @@ /* Override abi-tags ABI version if necessary. */ #undef __ABI_TAG_VERSION -/* Mach/Hurd specific: define if mig supports the `retcode' keyword. */ -#undef HAVE_MIG_RETCODE - /* Mach specific: define if the `host_page_size' RPC is available. */ #undef HAVE_HOST_PAGE_SIZE diff --git a/sysdeps/mach/configure b/sysdeps/mach/configure index b08872b8bc..df20d8640f 100644 --- a/sysdeps/mach/configure +++ b/sysdeps/mach/configure @@ -485,40 +485,4 @@ if test $libc_cv_mach_i386_gdt = yes; then fi - -# See if mig groks `retcode'. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $MIG supports the retcode keyword" >&5 -$as_echo_n "checking whether $MIG supports the retcode keyword... " >&6; } -if ${hurd_cv_mig_retcode+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat > conftest.defs <<\EOF -#include -#include -subsystem foobar 1000; -type reply_port_t = polymorphic | MACH_MSG_TYPE_PORT_SEND_ONCE - ctype: mach_port_t; -simpleroutine foobar_reply ( - reply_port: reply_port_t; - err: kern_return_t, RetCode); -EOF -if { ac_try='CC="${CC}" ${MIG-false} -n conftest.defs 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - hurd_cv_mig_retcode=yes -else - hurd_cv_mig_retcode=no -fi -rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hurd_cv_mig_retcode" >&5 -$as_echo "$hurd_cv_mig_retcode" >&6; } -if test $hurd_cv_mig_retcode = yes; then - $as_echo "#define HAVE_MIG_RETCODE 1" >>confdefs.h - -fi - CPPFLAGS=$OLD_CPPFLAGS diff --git a/sysdeps/mach/configure.ac b/sysdeps/mach/configure.ac index 537677c1d7..869cc9f820 100644 --- a/sysdeps/mach/configure.ac +++ b/sysdeps/mach/configure.ac @@ -104,30 +104,4 @@ if test $libc_cv_mach_i386_gdt = yes; then AC_DEFINE([HAVE_I386_SET_GDT]) fi -dnl Swiped from hurd/aclocal.m4 -AC_DEFUN([hurd_MIG_RETCODE], [dnl -# See if mig groks `retcode'. -AC_CACHE_CHECK(whether $MIG supports the retcode keyword, hurd_cv_mig_retcode, -[cat > conftest.defs <<\EOF -#include -#include -subsystem foobar 1000; -type reply_port_t = polymorphic | MACH_MSG_TYPE_PORT_SEND_ONCE - ctype: mach_port_t; -simpleroutine foobar_reply ( - reply_port: reply_port_t; - err: kern_return_t, RetCode); -EOF -if AC_TRY_COMMAND([CC="${CC}" ${MIG-false} -n conftest.defs 1>&AS_MESSAGE_LOG_FD]); then - hurd_cv_mig_retcode=yes -else - hurd_cv_mig_retcode=no -fi -rm -f conftest*]) -if test $hurd_cv_mig_retcode = yes; then - AC_DEFINE(HAVE_MIG_RETCODE) -fi]) - -hurd_MIG_RETCODE - CPPFLAGS=$OLD_CPPFLAGS