aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavio Cruz <flaviocruz@gmail.com>2023-05-07 23:30:36 -0400
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2023-05-08 22:38:53 +0200
commitef5924402864ef049f40a39e73967628583bc1a4 (patch)
tree0435339ac7ab7893acb4193cb5c874bd8c9f8b98
parentadd3d8afc7fd199c0fe6bf40a46462c2f77f9ef5 (diff)
downloadhurd-ef5924402864ef049f40a39e73967628583bc1a4.tar.gz
hurd-ef5924402864ef049f40a39e73967628583bc1a4.tar.bz2
hurd-ef5924402864ef049f40a39e73967628583bc1a4.zip
Stop checking if MiG supports retcode.
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. We force RETURN_CODE_ARG to use retcode which is a no-op. Message-Id: <ZFhs3KSeGhuubS8T@jupiter.tail36e24.ts.net>
-rw-r--r--aclocal.m424
-rw-r--r--configure.ac2
-rw-r--r--hurd/hurd_types.defs5
3 files changed, 0 insertions, 31 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 911dca2b..d54c7c2b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2,30 +2,6 @@ dnl These modifications are to allow for an empty cross compiler tree.
dnl In the situation that cross-linking is impossible, the variable
dnl `cross_linkable' will be substituted with "yes".
-dnl
-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])
-
dnl The following check is based on a similar check in GNU inetutils 1.4.0.
dnl
dnl hurd_LIB_NCURSESW -- check for, and configure, ncursesw
diff --git a/configure.ac b/configure.ac
index e913b3f3..9c80b96a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,8 +113,6 @@ fi
dnl Let these propagate from the environment.
AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS)
-hurd_MIG_RETCODE
-
# See if --version-script is available.
AC_CACHE_CHECK(for ld --version-script, hurd_cv_ld_version_script_option, [dnl
cat > conftest.c <<\EOF
diff --git a/hurd/hurd_types.defs b/hurd/hurd_types.defs
index 63003a24..9f176fef 100644
--- a/hurd/hurd_types.defs
+++ b/hurd/hurd_types.defs
@@ -378,12 +378,7 @@ intranpayload: mach_port_t MACH_PAYLOAD_TO_PORT
#define SCP
#endif
-#ifdef HAVE_MIG_RETCODE
#define RETURN_CODE_ARG in return_code: kern_return_t, retcode
-#else
-#define RETURN_CODE_ARG in return_code: kern_return_t
-#endif
-
#ifdef USERPREFIX
userprefix USERPREFIX;