diff options
author | Flavio Cruz <flaviocruz@gmail.com> | 2023-05-10 01:20:34 -0400 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-05-11 01:28:34 +0200 |
commit | 3ca9f43d1007956251130ee5a59abb63bff8a6b6 (patch) | |
tree | 984844688ca7af40da94bc95e0e0079f4b592335 | |
parent | 1a57ab0c923f269d1d7c29dfe4634c0ae66d69ac (diff) | |
download | glibc-3ca9f43d1007956251130ee5a59abb63bff8a6b6.zip glibc-3ca9f43d1007956251130ee5a59abb63bff8a6b6.tar.gz glibc-3ca9f43d1007956251130ee5a59abb63bff8a6b6.tar.bz2 |
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: <ZFspor91aoMwbh9T@jupiter.tail36e24.ts.net>
-rw-r--r-- | config.h.in | 3 | ||||
-rw-r--r-- | sysdeps/mach/configure | 36 | ||||
-rw-r--r-- | sysdeps/mach/configure.ac | 26 |
3 files changed, 0 insertions, 65 deletions
diff --git a/config.h.in b/config.h.in index c87008b..44a3407 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 b08872b..df20d86 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 <mach/std_types.defs> -#include <mach/mach_types.defs> -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 537677c..869cc9f 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 <mach/std_types.defs> -#include <mach/mach_types.defs> -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 |